diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-08-05 09:37:24 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-08-05 09:37:24 +0200 |
| commit | 900b88f866f4af6a58fadfe316128325eda3a218 (patch) | |
| tree | ccf95b063ed8f6bbc6452ee96aa2224e36f2f140 | |
| parent | b4223292032e5c77930d8c565f0b42492508be67 (diff) | |
php-pecl-http: more upstream patches
| -rw-r--r-- | pecl_http-git.patch | 58 | ||||
| -rw-r--r-- | php-pecl-http.spec | 8 |
2 files changed, 65 insertions, 1 deletions
diff --git a/pecl_http-git.patch b/pecl_http-git.patch index 0674e01..3553811 100644 --- a/pecl_http-git.patch +++ b/pecl_http-git.patch @@ -91,3 +91,61 @@ index 6328fa4..20ef3ac 100644 -- 1.9.2 +From 28e32ca3227d5a3a8b9a1f409aac4f7b6e3fa5ea Mon Sep 17 00:00:00 2001 +From: Michael Wallner <mike@php.net> +Date: Tue, 5 Aug 2014 06:59:14 +0200 +Subject: [PATCH] fix leak + +--- + php_http_client_curl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/php_http_client_curl.c b/php_http_client_curl.c +index 15d2619..baf99ce 100644 +--- a/php_http_client_curl.c ++++ b/php_http_client_curl.c +@@ -1309,7 +1309,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) + } + if ((opt = php_http_option_register(registry, ZEND_STRL("certtype"), CURLOPT_SSLCERTTYPE, IS_STRING))) { + opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; +- ZVAL_STRING(&opt->defval, "PEM", 1); ++ ZVAL_STRING(&opt->defval, "PEM", 0); + } + if ((opt = php_http_option_register(registry, ZEND_STRL("key"), CURLOPT_SSLKEY, IS_STRING))) { + opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; +@@ -1317,7 +1317,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) + } + if ((opt = php_http_option_register(registry, ZEND_STRL("keytype"), CURLOPT_SSLKEYTYPE, IS_STRING))) { + opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; +- ZVAL_STRING(&opt->defval, "PEM", 1); ++ ZVAL_STRING(&opt->defval, "PEM", 0); + } + if ((opt = php_http_option_register(registry, ZEND_STRL("keypasswd"), CURLOPT_SSLKEYPASSWD, IS_STRING))) { + opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; +-- +1.9.2 + +From 57bfeaae7196fd754aad2150dfd1d3258ea8ce66 Mon Sep 17 00:00:00 2001 +From: Michael Wallner <mike@php.net> +Date: Tue, 5 Aug 2014 08:07:26 +0200 +Subject: [PATCH] fix write on stack + +--- + php_http_encoding.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/php_http_encoding.c b/php_http_encoding.c +index 403d781..7f0462c 100644 +--- a/php_http_encoding.c ++++ b/php_http_encoding.c +@@ -53,7 +53,6 @@ const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Data does not seem to be chunked encoded"); + memcpy(*decoded, encoded, encoded_len); + *decoded_len = encoded_len; +- decoded[*decoded_len] = '\0'; + return encoded + encoded_len; + } else { + efree(*decoded); +-- +1.9.2 + diff --git a/php-pecl-http.spec b/php-pecl-http.spec index 33db5ef..f890daa 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -29,7 +29,7 @@ Name: %{?scl_prefix}php-pecl-http Version: 2.1.0 -Release: 0.1.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 0.2.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Summary: Extended HTTP support License: BSD @@ -112,11 +112,14 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}%{?prev Obsoletes: php53-pecl-http Obsoletes: php53u-pecl-http Obsoletes: php54-pecl-http +Obsoletes: php54w-pecl-http %if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-http +Obsoletes: php55w-pecl-http %endif %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-http +Obsoletes: php56w-pecl-http %endif %endif @@ -320,6 +323,9 @@ rm -rf %{buildroot} %changelog +* Tue Aug 05 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-0.2.RC1 +- add upstream patches + * Sat Aug 02 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-0.1.RC1 - Update to 2.1.0RC1 - run test suite during build |