From: Xinchen Hui <laruence@php.net>
Date: Sat, 14 Feb 2015 14:20:33 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e017f35b7f91d9be6e8f937a81c21d9b0d30825b;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/pgsql/pgsql.c
---

e017f35b7f91d9be6e8f937a81c21d9b0d30825b
diff --cc ext/pgsql/pgsql.c
index ea1a314395,4bc20bc142..e27bd22eca
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -5986,11 -5967,16 +5983,16 @@@ PHP_PGSQL_API int php_pgsql_convert(PGc
  						}
  						else {
  							/* better regex? */
 -							if (php_pgsql_convert_match(Z_STRVAL_PP(val), Z_STRLEN_PP(val), "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$", 0 TSRMLS_CC) == FAILURE) {
 -								if (php_pgsql_convert_match(Z_STRVAL_PP(val), Z_STRLEN_PP(val), "^[+-]{0,1}(inf)(inity){0,1}$", 1 TSRMLS_CC) == FAILURE) {
 +							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_PP(val), 1);
 -									php_pgsql_add_quotes(new_val, 1 TSRMLS_CC);
++									ZVAL_STRING(&new_val, Z_STRVAL_P(val));
++									php_pgsql_add_quotes(&new_val, 1);
+ 								}
  							}
  							else {
 -								ZVAL_STRING(new_val, Z_STRVAL_PP(val), 1);
 +								ZVAL_STRING(&new_val, Z_STRVAL_P(val));
  							}
  						}
  						break;