commit fe2476d85fc29325a675c178c5208033a3f9bbe6
Author: Elan Ruusamäe <[email protected]>
Date: Mon Dec 31 14:37:05 2012 +0200
- add fix for bug 50563: parse_url produces warnings
bug-50563.patch | 14 ++++++++++++++
php.spec | 4 +++-
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 05446fe..cb2c9bf 100644
--- a/php.spec
+++ b/php.spec
@@ -120,7 +120,7 @@ Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирова
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: %{orgname}%{php_suffix}
Version: 5.2.17
-Release: 26
+Release: 27
Epoch: 4
License: PHP
Group: Libraries
@@ -206,6 +206,7 @@ Patch65: system-libzip.patch
Patch66: bug-47930.patch
Patch67: php-db.patch
Patch68: php-libxml.patch
+Patch69: bug-50563.patch
# CENTALT patches
# CVE
Patch201: php-5.2.17-CVE-2011-2202.patch
@@ -1989,6 +1990,7 @@ done
%patch66 -p2
%patch67 -p1
%patch68 -p1
+%patch69 -p4
%patch201 -p1 -b .CVE-2011-2202
%patch202 -p1 -b .CVE-2011-1938
diff --git a/bug-50563.patch b/bug-50563.patch
new file mode 100644
index 0000000..9227ac2
--- /dev/null
+++ b/bug-50563.patch
@@ -0,0 +1,14 @@
+https://bugs.php.net/bug.php?id=50563
+
+do not throw warning as php 5.3.3 does not
+--- php/php-src/branches/PHP_5_3/ext/standard/url.c 2010/06/16 18:45:54
300500
++++ php/php-src/branches/PHP_5_3/ext/standard/url.c 2010/06/16 18:56:24
300501
+@@ -355,7 +355,7 @@
+
+ resource = php_url_parse_ex(str, str_len);
+ if (resource == NULL) {
+- php_error_docref1(NULL TSRMLS_CC, str, E_WARNING, "Unable to
parse URL");
++ /* @todo Find a method to determine why php_url_parse_ex()
failed */
+ RETURN_FALSE;
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/fe2476d85fc29325a675c178c5208033a3f9bbe6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
