diff options
| author | Hannes Magnusson <bjori@php.net> | 2012-03-24 17:20:14 +0100 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2012-03-24 17:20:14 +0100 |
| commit | 7a1c76538541e74719faf2311d72a70acd3c01e4 (patch) | |
| tree | bfc41ddf86afb36855e5e2a4f06e0267d06bd49d | |
| parent | 69b647c43be5729337024abdc6bf8565a1aa9a5b (diff) | |
| parent | 4fc4dd8760ddd8a53df9b59921093cc6b523154e (diff) | |
| download | php-git-7a1c76538541e74719faf2311d72a70acd3c01e4.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
This is a git checkout
Revert incorrect fix
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ext/soap/php_http.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 0a6fcd10ea..49a88b1380 100644 --- 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 index 69deccde7f..a15648808d 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) { |