diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-03-21 16:42:08 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-03-21 16:42:08 +0400 |
| commit | a8cc0b05b45110ccf408ea9410447bf82b8826f2 (patch) | |
| tree | e0cae83e715042a6122cac2fbe736f48158a94ae /ext/soap/php_http.h | |
| parent | 1e18f11c9ab56fb120c9e26ecd3f68f0651cddde (diff) | |
| parent | 657547f8c4758efcf85c73fec6d7fd8b3983d7cb (diff) | |
| download | php-git-a8cc0b05b45110ccf408ea9410447bf82b8826f2.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #49853 (Soap Client stream context header option ignored)
Conflicts:
NEWS
ext/soap/php_sdl.c
Diffstat (limited to 'ext/soap/php_http.h')
| -rw-r--r-- | ext/soap/php_http.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/soap/php_http.h b/ext/soap/php_http.h index 2cab5c06c9..540a91708a 100644 --- a/ext/soap/php_http.h +++ b/ext/soap/php_http.h @@ -31,6 +31,11 @@ int make_http_soap_request(zval *this_ptr, char **response, int *response_len TSRMLS_DC); -void proxy_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC); -void basic_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC); +int proxy_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC); +int basic_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC); +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); #endif |