[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Feb 3 01:32:26 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3307r2=1.3308diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3307 php-src/ChangeLog:1.3308 --- php-src/ChangeLog:1.3307Mon Feb 2 01:32:23 2009 +++ php-src/ChangeLog Tue Feb 3 01:32:25 2009 @@ -1,3 +1,91 @@ +2009-02-02 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + NEWS + ext/filter/logical_filters.c + ext/filter/logical_filters.c + ext/filter/tests/016.phpt + ext/filter/tests/016.phpt: + + MFB: Fixed bug #47282 (FILTER_VALIDATE_EMAIL is marking valid email + addresses as invalid) + +* (PHP_5_3) + ext/filter/logical_filters.c + ext/filter/tests/016.phpt: + + Fixed bug #47282 (FILTER_VALIDATE_EMAIL is marking valid email addresses + as + invalid) + +2009-02-02 Nuno Lopes nunoplo...@sapo.pt + +* ZendEngine2/zend_ini_scanner.c + ZendEngine2/zend_ini_scanner.c + ZendEngine2/zend_ini_scanner_defs.h + ZendEngine2/zend_ini_scanner_defs.h: + regenerate + +* ZendEngine2/zend_ini_scanner.l + ext/standard/tests/file/bug46347.phpt: + MFB: fix #46347 + +* ext/standard/tests/file/bug46347.phpt + ext/standard/tests/file/bug46347.phpt: + + file bug46347.phpt was initially added on branch PHP_5_3. + +* (PHP_5_3) + NEWS + ZendEngine2/zend_ini_scanner.l: + fix bug #46347: allow * in ini keys + +2009-02-02 Felipe Pena felipe...@gmail.com + +* (PHP_5_2) + ext/soap/soap.c + ext/soap/soap.c: + - MFH: Fixed bug #47269 (Typo: SoapSlient instead of SoapClient) + +* ext/soap/soap.c: + - Fixed bug #47269 (Typo: SoapSlient instead of SoapClient) + +2009-02-02 Pierre-Alain Joye pierre@gmail.com + +* win32/build/config.w32.h.in + win32/build/config.w32.h.in: + - define HAVE_SOCKLEN_T as it exists (vc6+) + +* main/streams/php_stream_transport.h + main/streams/php_stream_transport.h: + - silent compiler warning about socklen_t benign redefinition + +* (PHP_5_3) + sapi/apache_hooks/php_apache.c: + - MFH: fix build (use the same arginfo than the aliased func) + +* sapi/apache_hooks/php_apache.c: + - fix build (use the same arginfo than the aliased func) + +2009-02-02 Moriyoshi Koizumi m...@mozo.jp + +* (PHP_5_2) + NEWS + ext/mbstring/libmbfl/filters/mbfilter_cp936.c + ext/mbstring/libmbfl/filters/mbfilter_cp936.c + ext/mbstring/tests/bug46843.phpt + ext/mbstring/tests/bug46843.phpt: + - MFH: Fix bug #46843 (CP936 euro symbol is not converted properly) + +* ext/mbstring/tests/bug46843.phpt + ext/mbstring/tests/bug46843.phpt + ext/mbstring/tests/bug46843.phpt: +1.1.4; + * Forgot to add the test. + +* ext/mbstring/libmbfl/filters/mbfilter_cp936.c: + - Fix bug #46843 (CP936 euro symbol is not converted properly) + 2009-02-01 David Soria Parra dso...@gmx.net * configure.in: @@ -29215,7 +29303,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3307 2009/02/02 01:32:23 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3308 2009/02/03 01:32:25 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
pajoye Mon Feb 2 08:47:09 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
- fix build (use the same arginfo than the aliased func)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.41r2=1.42diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.41
php-src/sapi/apache_hooks/php_apache.c:1.42
--- php-src/sapi/apache_hooks/php_apache.c:1.41 Fri Jan 30 14:35:22 2009
+++ php-src/sapi/apache_hooks/php_apache.c Mon Feb 2 08:47:09 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.41 2009/01/30 14:35:22 felipe Exp $ */
+/* $Id: php_apache.c,v 1.42 2009/02/02 08:47:09 pajoye Exp $ */
#include php_apache_http.h
@@ -91,7 +91,7 @@
PHP_FE(apache_response_headers,
arginfo_apachehooks__void)
PHP_FE(apache_get_version,
arginfo_apachehooks__void)
PHP_FE(apache_get_modules,
arginfo_apachehooks__void)
- PHP_FALIAS(getallheaders, apache_request_headers,
arginfo_apachehooks_request_headers)
+ PHP_FALIAS(getallheaders, apache_request_headers,
arginfo_apachehooks__void)
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache_hooks php_apache.c
pajoye Mon Feb 2 08:47:23 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache_hooks php_apache.c
Log:
- MFH: fix build (use the same arginfo than the aliased func)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.12r2=1.19.2.3.2.5.2.13diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.12
php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.13
--- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.12Fri Jan 30
14:38:12 2009
+++ php-src/sapi/apache_hooks/php_apache.c Mon Feb 2 08:47:23 2009
@@ -17,7 +17,7 @@
| David Sklar sk...@student.net |
+--+
*/
-/* $Id: php_apache.c,v 1.19.2.3.2.5.2.12 2009/01/30 14:38:12 felipe Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.5.2.13 2009/02/02 08:47:23 pajoye Exp $ */
#include php_apache_http.h
@@ -91,7 +91,7 @@
PHP_FE(apache_response_headers,
arginfo_apachehooks__void)
PHP_FE(apache_get_version,
arginfo_apachehooks__void)
PHP_FE(apache_get_modules,
arginfo_apachehooks__void)
- PHP_FALIAS(getallheaders, apache_request_headers,
arginfo_apachehooks_request_headers)
+ PHP_FALIAS(getallheaders, apache_request_headers,
arginfo_apachehooks__void)
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file bug46347.phpt ZendEngine2 zend_ini_scanner.l
nlopess Mon Feb 2 19:25:30 2009 UTC
Modified files:
/ZendEngine2zend_ini_scanner.l
/php-src/ext/standard/tests/filebug46347.phpt
Log:
MFB: fix #46347
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.l?r1=1.60r2=1.61diff_format=u
Index: ZendEngine2/zend_ini_scanner.l
diff -u ZendEngine2/zend_ini_scanner.l:1.60 ZendEngine2/zend_ini_scanner.l:1.61
--- ZendEngine2/zend_ini_scanner.l:1.60 Fri Jan 2 20:36:30 2009
+++ ZendEngine2/zend_ini_scanner.l Mon Feb 2 19:25:30 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: zend_ini_scanner.l,v 1.60 2009/01/02 20:36:30 felipe Exp $ */
+/* $Id: zend_ini_scanner.l,v 1.61 2009/02/02 19:25:30 nlopess Exp $ */
#include errno.h
#include zend.h
@@ -309,7 +309,7 @@
TABS_AND_SPACES [ \t]
WHITESPACE [ \t]+
CONSTANT [a-zA-Z][a-zA-Z0-9_]*
-LABEL [a-zA-Z0-9_][a-zA-Z0-9._-]*
+LABEL [a-zA-Z0-9_][a-zA-Z0-9*._-]*
TOKENS [:,.\[\]'()|^+-/*=%$!~?...@{}]
OPERATORS [|~()!]
DOLLAR_CURLY ${
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug46347.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/bug46347.phpt
diff -u /dev/null php-src/ext/standard/tests/file/bug46347.phpt:1.2
--- /dev/null Mon Feb 2 19:25:30 2009
+++ php-src/ext/standard/tests/file/bug46347.phpt Mon Feb 2 19:25:30 2009
@@ -0,0 +1,24 @@
+--TEST--
+Bug #46347 (parse_ini_file() doesn't support * in keys)
+--FILE--
+?php
+
+$str = EOF
+[section]
+part1.*.part2 = 1
+EOF;
+
+$file = __DIR__ . '/parse.ini';
+file_put_contents($file, $str);
+
+var_dump(parse_ini_file($file));
+?
+--CLEAN--
+?php
+unlink(__DIR__.'/parse.ini');
+?
+--EXPECT--
+array(1) {
+ [part1.*.part2]=
+ string(1) 1
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
pajoye Mon Feb 2 09:49:57 2009 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: - define HAVE_SOCKLEN_T as it exists (vc6+) http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.24r2=1.25diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.24 php-src/win32/build/config.w32.h.in:1.25 --- php-src/win32/build/config.w32.h.in:1.24Fri Jan 23 15:48:58 2009 +++ php-src/win32/build/config.w32.h.in Mon Feb 2 09:49:57 2009 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.24 2009/01/23 15:48:58 kalle Exp $ + $Id: config.w32.h.in,v 1.25 2009/02/02 09:49:57 pajoye Exp $ */ /* Define the minimum supported version */ @@ -148,6 +148,7 @@ /* Win32 supports socketpair by the emulation in win32/sockets.c */ #define HAVE_SOCKETPAIR 1 +#define HAVE_SOCKLEN_T 1 /* Win32 support proc_open */ #define PHP_CAN_SUPPORT_PROC_OPEN 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /main/streams php_stream_transport.h
pajoye Mon Feb 2 09:41:46 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/main/streams php_stream_transport.h Log: - silent compiler warning about socklen_t benign redefinition http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_stream_transport.h?r1=1.10.2.1.2.4.2.2r2=1.10.2.1.2.4.2.3diff_format=u Index: php-src/main/streams/php_stream_transport.h diff -u php-src/main/streams/php_stream_transport.h:1.10.2.1.2.4.2.2 php-src/main/streams/php_stream_transport.h:1.10.2.1.2.4.2.3 --- php-src/main/streams/php_stream_transport.h:1.10.2.1.2.4.2.2Wed Dec 31 11:15:48 2008 +++ php-src/main/streams/php_stream_transport.h Mon Feb 2 09:41:46 2009 @@ -16,7 +16,11 @@ +--+ */ -/* $Id: php_stream_transport.h,v 1.10.2.1.2.4.2.2 2008/12/31 11:15:48 sebastian Exp $ */ +/* $Id: php_stream_transport.h,v 1.10.2.1.2.4.2.3 2009/02/02 09:41:46 pajoye Exp $ */ +#ifdef PHP_WIN32 +#include config.w32.h +#include Ws2tcpip.h +#endif #if HAVE_SYS_SOCKET_H # include sys/socket.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams php_stream_transport.h
pajoye Mon Feb 2 09:49:41 2009 UTC Modified files: /php-src/main/streams php_stream_transport.h Log: - silent compiler warning about socklen_t benign redefinition http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_stream_transport.h?r1=1.17r2=1.18diff_format=u Index: php-src/main/streams/php_stream_transport.h diff -u php-src/main/streams/php_stream_transport.h:1.17 php-src/main/streams/php_stream_transport.h:1.18 --- php-src/main/streams/php_stream_transport.h:1.17Wed Dec 31 11:12:39 2008 +++ php-src/main/streams/php_stream_transport.h Mon Feb 2 09:49:41 2009 @@ -16,7 +16,11 @@ +--+ */ -/* $Id: php_stream_transport.h,v 1.17 2008/12/31 11:12:39 sebastian Exp $ */ +/* $Id: php_stream_transport.h,v 1.18 2009/02/02 09:49:41 pajoye Exp $ */ +#ifdef PHP_WIN32 +#include config.w32.h +#include WS2tcpip.h +#endif #if HAVE_SYS_SOCKET_H # include sys/socket.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard/tests/file bug46347.phpt ZendEngine2 zend_ini_scanner.l
nlopess Mon Feb 2 19:23:13 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug46347.phpt
Modified files:
/php-srcNEWS
/ZendEngine2zend_ini_scanner.l
Log:
fix bug #46347: allow * in ini keys
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.480r2=1.2027.2.547.2.965.2.481diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.480
php-src/NEWS:1.2027.2.547.2.965.2.481
--- php-src/NEWS:1.2027.2.547.2.965.2.480 Wed Jan 28 22:43:50 2009
+++ php-src/NEWSMon Feb 2 19:23:12 2009
@@ -2,6 +2,7 @@
|||
?? ??? 2009, PHP 5.3.0 Beta 2
- Fixed bug #47229 (preg_quote() should escape the '-' char). (Nuno)
+- Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno)
29 Jan 2009, PHP 5.3.0 Beta 1
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.l?r1=1.41.2.2.2.2.2.15r2=1.41.2.2.2.2.2.16diff_format=u
Index: ZendEngine2/zend_ini_scanner.l
diff -u ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.15
ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.16
--- ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.15Fri Jan 2 20:45:41 2009
+++ ZendEngine2/zend_ini_scanner.l Mon Feb 2 19:23:13 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.15 2009/01/02 20:45:41 felipe Exp
$ */
+/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.16 2009/02/02 19:23:13 nlopess Exp
$ */
#include errno.h
#include zend.h
@@ -308,7 +308,7 @@
TABS_AND_SPACES [ \t]
WHITESPACE [ \t]+
CONSTANT [a-zA-Z][a-zA-Z0-9_]*
-LABEL [a-zA-Z0-9_][a-zA-Z0-9._-]*
+LABEL [a-zA-Z0-9_][a-zA-Z0-9*._-]*
TOKENS [:,.\[\]'()|^+-/*=%$!~?...@{}]
OPERATORS [|~()!]
DOLLAR_CURLY ${
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug46347.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug46347.phpt
+++ php-src/ext/standard/tests/file/bug46347.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32.h.in
pajoye Mon Feb 2 09:40:55 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildconfig.w32.h.in Log: - define HAVE_SOCKLEN_T as it exists (vc6+) http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.7.2.4.2.3.2.10r2=1.7.2.4.2.3.2.11diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.10 php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.11 --- php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.10Fri Jan 23 15:49:49 2009 +++ php-src/win32/build/config.w32.h.in Mon Feb 2 09:40:55 2009 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.7.2.4.2.3.2.10 2009/01/23 15:49:49 kalle Exp $ + $Id: config.w32.h.in,v 1.7.2.4.2.3.2.11 2009/02/02 09:40:55 pajoye Exp $ */ /* Define the minimum supported version */ @@ -149,6 +149,7 @@ /* Win32 supports socketpair by the emulation in win32/sockets.c */ #define HAVE_SOCKETPAIR 1 +#define HAVE_SOCKLEN_T 1 /* Win32 support proc_open */ #define PHP_CAN_SUPPORT_PROC_OPEN 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter logical_filters.c /ext/filter/tests 016.phpt
iliaa Mon Feb 2 23:50:31 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/filter logical_filters.c
/php-src/ext/filter/tests 016.phpt
Log:
Fixed bug #47282 (FILTER_VALIDATE_EMAIL is marking valid email addresses as
invalid)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.22.2.5r2=1.1.2.22.2.6diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.22.2.5
php-src/ext/filter/logical_filters.c:1.1.2.22.2.6
--- php-src/ext/filter/logical_filters.c:1.1.2.22.2.5 Wed Dec 31 15:03:18 2008
+++ php-src/ext/filter/logical_filters.cMon Feb 2 23:50:31 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.1.2.22.2.5 2008/12/31 15:03:18 felipe Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.22.2.6 2009/02/02 23:50:31 iliaa Exp $ */
#include php_filter.h
#include filter_private.h
@@ -469,7 +469,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.)+[A-Za-z\\-]+))$/D;
+ const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.?)+[A-Za-z\\-]*))$/D;
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/016.phpt?r1=1.4.2.4r2=1.4.2.4.2.1diff_format=u
Index: php-src/ext/filter/tests/016.phpt
diff -u php-src/ext/filter/tests/016.phpt:1.4.2.4
php-src/ext/filter/tests/016.phpt:1.4.2.4.2.1
--- php-src/ext/filter/tests/016.phpt:1.4.2.4 Tue Dec 19 14:16:23 2006
+++ php-src/ext/filter/tests/016.phpt Mon Feb 2 23:50:31 2009
@@ -13,7 +13,8 @@
't...@com',
'@',
'[]()/@example.com',
-'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
+'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
+'e.x.a.m.p.l...@example.com'
);
foreach ($values as $value) {
var_dump(filter_var($value, FILTER_VALIDATE_EMAIL));
@@ -27,8 +28,9 @@
bool(false)
bool(false)
bool(false)
-bool(false)
+string(8) t...@com
bool(false)
bool(false)
string(57) qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net
-Done
+string(26) e.x.a.m.p.l...@example.com
+Done
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter logical_filters.c /ext/filter/tests 016.phpt
iliaa Mon Feb 2 23:51:19 2009 UTC
Modified files:
/php-src/ext/filter logical_filters.c
/php-src/ext/filter/tests 016.phpt
Log:
MFB: Fixed bug #47282 (FILTER_VALIDATE_EMAIL is marking valid email
addresses as invalid)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.31r2=1.32diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.31
php-src/ext/filter/logical_filters.c:1.32
--- php-src/ext/filter/logical_filters.c:1.31 Wed Dec 31 15:00:55 2008
+++ php-src/ext/filter/logical_filters.cMon Feb 2 23:51:19 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.31 2008/12/31 15:00:55 felipe Exp $ */
+/* $Id: logical_filters.c,v 1.32 2009/02/02 23:51:19 iliaa Exp $ */
#include php_filter.h
#include filter_private.h
@@ -473,7 +473,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.)+[A-Za-z\\-]+))$/D;
+ const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.?)+[A-Za-z\\-]*))$/D;
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/016.phpt?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/filter/tests/016.phpt
diff -u php-src/ext/filter/tests/016.phpt:1.8
php-src/ext/filter/tests/016.phpt:1.9
--- php-src/ext/filter/tests/016.phpt:1.8 Tue Dec 19 14:16:07 2006
+++ php-src/ext/filter/tests/016.phpt Mon Feb 2 23:51:19 2009
@@ -13,7 +13,8 @@
't...@com',
'@',
'[]()/@example.com',
-'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
+'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
+'e.x.a.m.p.l...@example.com'
);
foreach ($values as $value) {
var_dump(filter_var($value, FILTER_VALIDATE_EMAIL));
@@ -27,8 +28,9 @@
bool(false)
bool(false)
bool(false)
-bool(false)
+string(8) t...@com
bool(false)
bool(false)
string(57) qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net
-Done
+string(26) e.x.a.m.p.l...@example.com
+Done
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/filter logical_filters.c /ext/filter/tests 016.phpt
iliaa Mon Feb 2 23:51:58 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter logical_filters.c
/php-src/ext/filter/tests 016.phpt
/php-srcNEWS
Log:
MFB: Fixed bug #47282 (FILTER_VALIDATE_EMAIL is marking valid email
addresses as invalid)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.27r2=1.1.2.28diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.27
php-src/ext/filter/logical_filters.c:1.1.2.28
--- php-src/ext/filter/logical_filters.c:1.1.2.27 Wed Dec 31 15:39:48 2008
+++ php-src/ext/filter/logical_filters.cMon Feb 2 23:51:58 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.1.2.27 2008/12/31 15:39:48 felipe Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.28 2009/02/02 23:51:58 iliaa Exp $ */
#include php_filter.h
#include filter_private.h
@@ -469,7 +469,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.)+[A-Za-z\\-]+))$/D;
+ const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?\\.?)+[A-Za-z\\-]*))$/D;
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/016.phpt?r1=1.4.2.4r2=1.4.2.5diff_format=u
Index: php-src/ext/filter/tests/016.phpt
diff -u php-src/ext/filter/tests/016.phpt:1.4.2.4
php-src/ext/filter/tests/016.phpt:1.4.2.5
--- php-src/ext/filter/tests/016.phpt:1.4.2.4 Tue Dec 19 14:16:23 2006
+++ php-src/ext/filter/tests/016.phpt Mon Feb 2 23:51:58 2009
@@ -13,7 +13,8 @@
't...@com',
'@',
'[]()/@example.com',
-'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
+'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
+'e.x.a.m.p.l...@example.com'
);
foreach ($values as $value) {
var_dump(filter_var($value, FILTER_VALIDATE_EMAIL));
@@ -27,8 +28,9 @@
bool(false)
bool(false)
bool(false)
-bool(false)
+string(8) t...@com
bool(false)
bool(false)
string(57) qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net
-Done
+string(26) e.x.a.m.p.l...@example.com
+Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1404r2=1.2027.2.547.2.1405diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1404 php-src/NEWS:1.2027.2.547.2.1405
--- php-src/NEWS:1.2027.2.547.2.1404Mon Feb 2 04:54:10 2009
+++ php-src/NEWSMon Feb 2 23:51:58 2009
@@ -17,6 +17,8 @@
- Fixed bug in xml_error_string() which resulted in messages being
off by one. (Scott)
+- Fixed bug #47282 (FILTER_VALIDATE_EMAIL is marking valid email addresses
+ as invalid). (Ilia)
- Fixed bug #47220 (segfault in dom_document_parser in recovery mode). (Rob)
- Fixed bug #47217 (content-type is not set properly for file uploads).
(Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c
felipe Mon Feb 2 09:59:49 2009 UTC
Modified files:
/php-src/ext/soap soap.c
Log:
- Fixed bug #47269 (Typo: SoapSlient instead of SoapClient)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.258r2=1.259diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.258 php-src/ext/soap/soap.c:1.259
--- php-src/ext/soap/soap.c:1.258 Wed Dec 31 11:12:35 2008
+++ php-src/ext/soap/soap.c Mon Feb 2 09:59:49 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov dmi...@zend.com |
+--+
*/
-/* $Id: soap.c,v 1.258 2008/12/31 11:12:35 sebastian Exp $ */
+/* $Id: soap.c,v 1.259 2009/02/02 09:59:49 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3117,11 +3117,11 @@
ZVAL_LONG(params[4], one_way);
if (call_user_function(NULL, this_ptr, func, response, 5, params
TSRMLS_CC) != SUCCESS) {
- add_soap_fault(this_ptr, Client, SoapSlient::__doRequest()
failed, NULL, NULL TSRMLS_CC);
+ add_soap_fault(this_ptr, Client, SoapClient::__doRequest()
failed, NULL, NULL TSRMLS_CC);
ret = FALSE;
} else if (Z_TYPE_P(response) != IS_STRING Z_TYPE_P(response) !=
IS_UNICODE) {
if (!client-fault) {
- add_soap_fault(this_ptr, Client,
SoapSlient::__doRequest() returned non string value, NULL, NULL TSRMLS_CC);
+ add_soap_fault(this_ptr, Client,
SoapClient::__doRequest() returned non string value, NULL, NULL TSRMLS_CC);
}
ret = FALSE;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap soap.c
felipe Mon Feb 2 10:00:33 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/soap soap.c
Log:
- MFH: Fixed bug #47269 (Typo: SoapSlient instead of SoapClient)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.42r2=1.156.2.28.2.43diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.42
php-src/ext/soap/soap.c:1.156.2.28.2.43
--- php-src/ext/soap/soap.c:1.156.2.28.2.42 Mon Jan 5 22:16:58 2009
+++ php-src/ext/soap/soap.c Mon Feb 2 10:00:32 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov dmi...@zend.com |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.42 2009/01/05 22:16:58 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.43 2009/02/02 10:00:32 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2567,11 +2567,11 @@
ZVAL_LONG(params[4], one_way);
if (call_user_function(NULL, this_ptr, func, response, 5, params
TSRMLS_CC) != SUCCESS) {
- add_soap_fault(this_ptr, Client, SoapSlient::__doRequest()
failed, NULL, NULL TSRMLS_CC);
+ add_soap_fault(this_ptr, Client, SoapClient::__doRequest()
failed, NULL, NULL TSRMLS_CC);
ret = FALSE;
} else if (Z_TYPE_P(response) != IS_STRING) {
if (zend_hash_find(Z_OBJPROP_P(this_ptr), __soap_fault,
sizeof(__soap_fault), (void **) fault) == FAILURE) {
- add_soap_fault(this_ptr, Client,
SoapSlient::__doRequest() returned non string value, NULL, NULL TSRMLS_CC);
+ add_soap_fault(this_ptr, Client,
SoapClient::__doRequest() returned non string value, NULL, NULL TSRMLS_CC);
}
ret = FALSE;
} else if (zend_hash_find(Z_OBJPROP_P(this_ptr), trace,
sizeof(trace), (void **) trace) == SUCCESS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
