Merge branch 'PHP-5.4'

* PHP-5.4: This is a git checkout Revert incorrect fix
Sannis · Mar 24, 2012 · 54d82a9 · 54d82a9
2 parents 1772a5a + 7a1c765
commit 54d82a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/configure.in b/configure.in
@@ -233,7 +233,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

diff --git 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) {