[Pkg-php-commits] [php/debian-sid] Gentoo patch ext-curl-set_opt-crash has already been merged upstream

Raphael Geissert geissert at debian.org
Sun Feb 7 23:17:14 UTC 2010


The patch was still aplying by mere chance, but could probably lead to
other bugs.
---
 .../gentoo/006_ext-curl-set_opt-crash.patch        |   15 ---------------
 debian/patches/series                              |    1 -
 2 files changed, 0 insertions(+), 16 deletions(-)
 delete mode 100644 debian/patches/gentoo/006_ext-curl-set_opt-crash.patch

diff --git a/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch b/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
deleted file mode 100644
index 5abc618..0000000
--- a/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-006_ext-curl-set_opt-crash.patch
-PHP_5_2
-http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.42&r2=1.62.2.14.2.43&diff_format=u
-http://bugs.php.net/bug.php?id=47616
-Fixed bug #47616 (curl keeps crashing)
---- a/ext/curl/interface.c
-+++ b/ext/curl/interface.c
-@@ -1885,6 +1885,7 @@ static int _php_curl_setopt(php_curl *ch
- #if LIBCURL_VERSION_NUM >= 0x071101
- 				convert_to_string_ex(zvalue);
- 				/* with curl 7.17.0 and later, we can use COPYPOSTFIELDS, but we have to provide size before */
-+				convert_to_string_ex(zvalue);
- 				error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
- 				error = curl_easy_setopt(ch->cp, CURLOPT_COPYPOSTFIELDS, Z_STRVAL_PP(zvalue));
- #else
diff --git a/debian/patches/series b/debian/patches/series
index 04bd7dd..8c6f8c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,7 +32,6 @@ manpage_spelling.patch
 force_libmysqlclient_r.patch
 libedit_is_editline.patch
 bad_whatis_entries.patch
-gentoo/006_ext-curl-set_opt-crash.patch
 gentoo/009_ob-memory-leaks.patch
 mssql-null-exception.patch
 exif_read_data-segfault.patch
-- 
1.6.3.3





More information about the Pkg-php-commits mailing list