Skip to content

Commit

Permalink
Merge pull request #4 from xielingwang/master
Browse files Browse the repository at this point in the history
主要是增加了composer的支持
  • Loading branch information
andot committed Dec 5, 2014
2 parents 4544948 + 04b77b8 commit c9a5214
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 0 deletions.
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,20 @@ Through *Hprose*, You can conveniently and efficiently intercommunicate between

This project is the implementation of Hprose for PHP.

## Installation

### Download Source Code
[Download Link](https://github.com/xielingwang/hprose-php/archive/master.zip)

### install by `composer`
```javascript
{
"require": {
"hprose/hprose-php": "dev-master"
}
}
```

## Usage

### Server
Expand Down
14 changes: 14 additions & 0 deletions README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,20 @@

本项目是 Hprose 的 PHP 语言版本实现。

## 安装

### 通过下载源码
[下载地址](https://github.com/xielingwang/hprose-php/archive/master.zip)

### 通过composer
```javascript
{
"require": {
"hprose/hprose-php": "dev-master"
}
}
```

## 使用

### 服务器
Expand Down
24 changes: 24 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "hprose/hprose-php",
"type": "library",
"description": "It is a modern, lightweight, cross-language, cross-platform, object-oriented, high performance, remote dynamic communication middleware. It is not only easy to use, but powerful. You just need a little time to learn, then you can use it to easily construct cross language cross platform distributed application system.",
"keywords": ["Hprose","WebService","PHPRPC","RPC"],
"homepage": "http://hprose.com/",
"license": "MIT",
"authors": [
{
"name": "Andot",
"email": "andot@hprose.com",
"homepage": "http://hprose.com",
"role": "Developer"
}
],
"require": {
"php": ">=5.3.0"
},
"autoload": {
"classmap": [
"./php5/"
]
}
}
1 change: 1 addition & 0 deletions php5/HproseCurlHttpClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ protected function sendAndReceive($request) {
curl_setopt($this->curl, CURLOPT_HEADER, TRUE);
curl_setopt($this->curl, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, TRUE);
curl_setopt($this->curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
if (!ini_get('safe_mode')) {
curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, TRUE);
}
Expand Down

0 comments on commit c9a5214

Please sign in to comment.