diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-14 22:20:33 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-14 22:20:33 +0800 |
| commit | e017f35b7f91d9be6e8f937a81c21d9b0d30825b (patch) | |
| tree | 4f3e48d31687c21c2ddf39eacfea6acac99dd940 /ext/pgsql/pgsql.c | |
| parent | b73fa1fa8fdddb069ffa9f07e1362b29edf51162 (diff) | |
| parent | 1db720cd6d63f5feafb5c7ecc5fada35e2189cff (diff) | |
| download | php-git-e017f35b7f91d9be6e8f937a81c21d9b0d30825b.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
ext/pgsql/pgsql.c
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index ea1a314395..e27bd22eca 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -5746,9 +5746,6 @@ static int php_pgsql_convert_match(const char *str, size_t str_len, const char * regerr = regexec(&re, str, re.re_nsub+1, subs, 0); if (regerr == REG_NOMATCH) { -#ifdef PHP_DEBUG - php_error_docref(NULL, E_NOTICE, "'%s' does not match with '%s'", str, regex); -#endif ret = FAILURE; } else if (regerr) { @@ -5987,7 +5984,12 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con else { /* better regex? */ if (php_pgsql_convert_match(Z_STRVAL_P(val), Z_STRLEN_P(val), "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$", 0) == FAILURE) { - err = 1; + if (php_pgsql_convert_match(Z_STRVAL_P(val), Z_STRLEN_P(val), "^[+-]{0,1}(inf)(inity){0,1}$", 1) == FAILURE) { + err = 1; + } else { + ZVAL_STRING(&new_val, Z_STRVAL_P(val)); + php_pgsql_add_quotes(&new_val, 1); + } } else { ZVAL_STRING(&new_val, Z_STRVAL_P(val)); |