packages (PHP_5_2): php/php.spec, php/php-bug-51192.patch (NEW) - rel 10; a...

[arekm]

Author: arekm                        Date: Tue Apr 13 06:26:11 2010 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- rel 10; accept minus sign in dns names when validating url

---- Files affected:
packages/php:
   php.spec (1.805.2.57 -> 1.805.2.58) , php-bug-51192.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.57 packages/php/php.spec:1.805.2.58
--- packages/php/php.spec:1.805.2.57	Mon Apr 12 14:36:02 2010
+++ packages/php/php.spec	Tue Apr 13 08:26:05 2010
@@ -113,7 +113,7 @@
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
 Version:	5.2.13
-Release:	9
+Release:	10
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -186,6 +186,7 @@
 Patch51:	spl-shared.patch
 Patch52:	%{name}-libpng.patch
 Patch53:	%{name}-gmp.patch
+Patch54:	%{name}-bug-51192.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1838,6 +1839,7 @@
 %patch51 -p1
 %patch52 -p1
 %patch53 -p1
+%patch54 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -3095,6 +3097,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.58  2010/04/13 06:26:05  arekm
+- rel 10; accept minus sign in dns names when validating url
+
 Revision 1.805.2.57  2010/04/12 12:36:02  baggins
 - rel 9
 

================================================================
Index: packages/php/php-bug-51192.patch
diff -u /dev/null packages/php/php-bug-51192.patch:1.1.2.1
--- /dev/null	Tue Apr 13 08:26:11 2010
+++ packages/php/php-bug-51192.patch	Tue Apr 13 08:26:05 2010
@@ -0,0 +1,41 @@
+commit 1740db5a7045fe406dbf9de6c07caf7c944fbd85
+Author: aharvey <aharvey at c90b9560-bf6c-de11-be94-00142212c4b1>
+Date:   Wed Mar 3 09:25:50 2010 +0000
+
+    Fix for bug #51192 (FILTER_VALIDATE_URL will invalidate a hostname that includes '-'). Original patch by solar at azrael.ws.
+    
+    
+    git-svn-id: http://svn.php.net/repository/php/php-src/branches/PHP_5_2@295773 c90b9560-bf6c-de11-be94-00142212c4b1
+
+diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
+index 0b27a64..52dcb50 100644
+--- a/ext/filter/logical_filters.c
++++ b/ext/filter/logical_filters.c
+@@ -467,7 +467,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
+ 		s = url->host;
+ 
+ 		while (s < e) {
+-			if (!isalnum((int)*(unsigned char *)s) && *s != '_' && *s != '.') {
++			if (!isalnum((int)*(unsigned char *)s) && *s != '-' && *s != '.') {
+ 				goto bad_url;
+ 			}
+ 			s++;
+diff --git a/ext/filter/tests/bug51192.phpt b/ext/filter/tests/bug51192.phpt
+new file mode 100644
+index 0000000..96c67ea
+--- /dev/null
++++ b/ext/filter/tests/bug51192.phpt
+@@ -0,0 +1,13 @@
++--TEST--
++bug 51192, FILTER_VALIDATE_URL will invalidate a hostname that includes '-'
++--SKIPIF--
++<?php if (!extension_loaded("filter")) die("skip"); ?>
++--FILE--
++<?php
++var_dump(filter_var('http://example.com/path', FILTER_VALIDATE_URL));
++var_dump(filter_var('http://exa-mple.com/path', FILTER_VALIDATE_URL));
++var_dump(filter_var('http://exa_mple.com/path', FILTER_VALIDATE_URL));
++--EXPECT--	
++string(23) "http://example.com/path"
++string(24) "http://exa-mple.com/path"
++bool(false)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.57&r2=1.805.2.58&f=u