From 8d0760f38a9d3dabb3a31d1d47f85827d27d0db4 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sat, 24 Mar 2012 12:27:55 -0400 Subject: [PATCH 1/2] Revert incorrect fix --- NEWS | 1 - ext/soap/php_http.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NEWS b/NEWS index fa36358231cc9..d278883f8bb13 100644 --- a/NEWS +++ b/NEWS @@ -93,7 +93,6 @@ PHP NEWS - SOAP . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry) - . Fixed bug #61423 (gzip compression fails). (Ilia) . Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent header). (carloschilazo at gmail dot com) . Fixed bug #60842, #51775 (Chunked response parsing error when diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 610c161836a74..358877df6319c 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -336,7 +336,7 @@ int make_http_soap_request(zval *this_ptr, n = 3; ZVAL_STRING(&func, "gzencode", 0); smart_str_append_const(&soap_headers_z,"Content-Encoding: gzip\r\n"); - ZVAL_LONG(params[2], 0x1f); + ZVAL_LONG(params[2], 1); } if (call_user_function(CG(function_table), (zval**)NULL, &func, &retval, n, params TSRMLS_CC) == SUCCESS && Z_TYPE(retval) == IS_STRING) { From 4fc4dd8760ddd8a53df9b59921093cc6b523154e Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Sat, 24 Mar 2012 17:16:50 +0100 Subject: [PATCH 2/2] This is a git checkout --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 8f579eff619c0..d3f96b0ac91d3 100644 --- a/configure.in +++ b/configure.in @@ -155,7 +155,7 @@ dnl Check if bison generated files exist when bison does not.. case $php_cv_bison_version in ""|invalid[)] if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then - AC_MSG_ERROR([bison is required to build PHP/Zend when building a SVN checkout!]) + AC_MSG_ERROR([bison is required to build PHP/Zend when building a GIT checkout!]) fi ;; esac