diff options
| author | Anatol Belski <ab@php.net> | 2018-11-18 12:32:47 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-11-18 12:32:47 +0100 |
| commit | fb06cca6cb10f0bf714d2016f9d0137e20b17914 (patch) | |
| tree | 70acb1d8b488578f6c99b2b5b8b53804b03ea609 /ext/pgsql/pgsql.c | |
| parent | b4776cda2e605d5f33d9ad5abd494b2cbeecc0c2 (diff) | |
| parent | 0434141ce93d5033e47c46c78a8849ac3bfa4311 (diff) | |
| download | php-git-fb06cca6cb10f0bf714d2016f9d0137e20b17914.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 1f88bf4205..1d989ae656 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -6253,7 +6253,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con } else { /* FIXME: better regex must be used */ - if (php_pgsql_convert_match(Z_STRVAL_P(val), Z_STRLEN_P(val), "^(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1})){0,1}$", 1) == FAILURE) { + if (php_pgsql_convert_match(Z_STRVAL_P(val), Z_STRLEN_P(val), "^(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}){0,1}$", 1) == FAILURE) { err = 1; } else { |