diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/soap/php_http.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/soap/php_http.h')
| -rw-r--r-- | ext/soap/php_http.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/soap/php_http.h b/ext/soap/php_http.h index b752641b1b..03007f70f0 100644 --- a/ext/soap/php_http.h +++ b/ext/soap/php_http.h @@ -28,13 +28,13 @@ int make_http_soap_request(zval *this_ptr, char *location, char *soapaction, int soap_version, - zval *response TSRMLS_DC); + zval *response); -int proxy_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC); -int basic_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC); +int proxy_authentication(zval* this_ptr, smart_str* soap_headers); +int basic_authentication(zval* this_ptr, smart_str* soap_headers); void http_context_headers(php_stream_context* context, zend_bool has_authorization, zend_bool has_proxy_authorization, zend_bool has_cookies, - smart_str* soap_headers TSRMLS_DC); + smart_str* soap_headers); #endif |