iliaa Mon Sep 3 15:36:05 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/pgsql pgsql.c
Log:
Fixed bug #42506 (php_pgsql_convert() timezone parse bug)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.924&r2=1.2027.2.547.2.925&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.924 php-src/NEWS:1.2027.2.547.2.925
--- php-src/NEWS:1.2027.2.547.2.924 Mon Sep 3 02:53:56 2007
+++ php-src/NEWS Mon Sep 3 15:36:04 2007
@@ -6,6 +6,8 @@
- Fixed bug #42512 (ip2long('255.255.255.255') should return 4294967295 on
64-bit PHP). (Derick)
+- Fixed bug #42506 (php_pgsql_convert() timezone parse bug) (nonunnet at
+ gmail dot com, Ilia)
- Fixed bug #42462 (Segmentation when trying to set an attribute in a
DOMElement). (Rob)
- Fixed bug #42453 (CGI SAPI does not shut down cleanly with -i/-m/-v cmdline
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.22&r2=1.331.2.13.2.23&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.22
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.23
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.22 Wed Aug 22 22:40:29 2007
+++ php-src/ext/pgsql/pgsql.c Mon Sep 3 15:36:04 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.331.2.13.2.22 2007/08/22 22:40:29 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.23 2007/09/03 15:36:04 iliaa Exp $ */
#include <stdlib.h>
@@ -5001,7 +5001,7 @@
ZVAL_STRINGL(new_val,
"NOW()", sizeof("NOW()")-1, 1);
} else {
/* FIXME: better regex
must be used */
- if
(php_pgsql_convert_match(Z_STRVAL_PP(val),
"^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([
\\t]*([+-][0-9]{1,2}(:[0-9]{1,2}){0,1}|[a-zA-Z]{1,5})){0,1})){0,1}$", 1
TSRMLS_CC) == FAILURE) {
+ if
(php_pgsql_convert_match(Z_STRVAL_PP(val),
"^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([
\\t]*([+-][0-9]{1,2}(:[0-9]{1,2}){0,1}|[-a-zA-Z_/+]{1,50})){0,1})){0,1}$", 1
TSRMLS_CC) == FAILURE) {
err = 1;
} else {
ZVAL_STRING(new_val, Z_STRVAL_PP(val), 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
