diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/soap/php_http.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/soap/php_http.h')
| -rw-r--r-- | ext/soap/php_http.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/soap/php_http.h b/ext/soap/php_http.h index 03007f70f0..8bb9f990ab 100644 --- a/ext/soap/php_http.h +++ b/ext/soap/php_http.h @@ -22,11 +22,11 @@ #ifndef PHP_HTTP_H #define PHP_HTTP_H -int make_http_soap_request(zval *this_ptr, - char *request, - int request_size, - char *location, - char *soapaction, +int make_http_soap_request(zval *this_ptr, + char *request, + int request_size, + char *location, + char *soapaction, int soap_version, zval *response); |