diff options
| author | Stanley Sufficool <ssufficool@php.net> | 2013-10-05 17:57:23 -0700 |
|---|---|---|
| committer | Stanley Sufficool <ssufficool@php.net> | 2013-10-05 17:57:23 -0700 |
| commit | 3e023c3ddf9e80046803a989f4951ee16d3b8f9b (patch) | |
| tree | 602f3b798d09f49f069fd9a046d502931f56c158 /ext/soap/php_http.c | |
| parent | b144c263191f857391d3cc009951c95d25a2cdb3 (diff) | |
| parent | 3261eb348f5aea14f74010d883cfc68978fd8ed9 (diff) | |
| download | php-git-3e023c3ddf9e80046803a989f4951ee16d3b8f9b.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (705 commits)
Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired. Note the implementations differ so you will see different ldap behavior.
Fix bug #65667: ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
Fix bug #65821: By-ref foreach on property access of string offset segfaults
Fixed bug #64230 (XMLReader does not suppress errors)
add NEWS and UPGRADING about gost-crypto
fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
typo: really fix bug #51936 Crash with clone xmlreader
fix bug #59613 (Crash with clone XMLReader)
Fix Bug #60633 build warning in bcmath
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
Revert "Make 'make distclean' remove the downloaded pear PHAR"
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
Reverted patch (it was used for internal testing and was committed by accident)
OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
Make 'make distclean' remove the downloaded pear PHAR
fix test
...
Diffstat (limited to 'ext/soap/php_http.c')
| -rw-r--r-- | ext/soap/php_http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 7a109c1966..86ab03d9c8 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -194,7 +194,7 @@ static php_stream* http_connect(zval* this_ptr, php_url *phpurl, int use_ssl, ph if (use_ssl && !*use_proxy) { if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_ssl_method", sizeof("_ssl_method"), (void **) &tmp) == SUCCESS && Z_TYPE_PP(tmp) == IS_LONG) { - /* uses contants declared in soap.c to determine ssl uri protocol */ + /* uses constants declared in soap.c to determine ssl uri protocol */ switch (Z_LVAL_PP(tmp)) { case SOAP_SSL_METHOD_TLS: protocol = "tls"; @@ -1222,7 +1222,7 @@ try_again: zval *err; MAKE_STD_ZVAL(err); ZVAL_STRINGL(err, http_body, http_body_size, 1); - add_soap_fault(this_ptr, "HTTP", "Didn't recieve an xml document", NULL, err TSRMLS_CC); + add_soap_fault(this_ptr, "HTTP", "Didn't receive an xml document", NULL, err TSRMLS_CC); efree(content_type); efree(http_headers); efree(http_body); |