From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 5 Sep 2007 12:56:16 +0000 (+0000)
Subject: MFB: Fixed bug #42506 (php_pgsql_convert() timezone parse bug)
X-Git-Tag: RELEASE_2_0_0a1~1875
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83e7b29d472e711e756e546e1e11b5c1fda3ccea;p=php

MFB: Fixed bug #42506 (php_pgsql_convert() timezone parse bug)
---

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 5c7129bde7..a94b7c4559 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -4975,7 +4975,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 							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);