diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-14 22:03:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-14 22:03:53 +0800 |
| commit | 40a94597aeef59172cefecb25c79ec54ff7b5725 (patch) | |
| tree | 3feba21453fb0cbb329bbea8dc696693d15da8f1 /ext/pgsql/pgsql.c | |
| parent | c0dd221a3a47dfcb53e1c4415e1d3979ad1da6df (diff) | |
| parent | 0421404b7322167cdc7e3b5232757ce4a7bc7e11 (diff) | |
| download | php-git-40a94597aeef59172cefecb25c79ec54ff7b5725.tar.gz | |
Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 33e65767cf..68459f1376 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -5607,11 +5607,14 @@ 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_PP(val), Z_STRLEN_PP(val), "^([+-]{0,1}[0-9]+)|([+-]{0,1}[0-9]*[\\.][0-9]+)|([+-]{0,1}[0-9]+[\\.][0-9]*)$", 0 TSRMLS_CC) == FAILURE) { + if (php_pgsql_convert_match(Z_STRVAL_PP(val), Z_STRLEN_PP(val), "^([+-]{0,1}[0-9]+)|([+-]{0,1}[0-9]*[\\.][0-9]+)|([+-]{0,1}[0-9]+[\\.][0-9]*)|([+-]{0,1}(inf)(inity){0,1})$", 1 TSRMLS_CC) == FAILURE) { err = 1; } else { ZVAL_STRING(new_val, Z_STRVAL_PP(val), 1); + if(strcasestr(Z_STRVAL_PP(val),"inf")!=0){ + php_pgsql_add_quotes(new_val, 1 TSRMLS_CC); + } } } break; |