Merge branch 'PHP-5.6'

Conflicts:
	ext/pgsql/pgsql.c

diff --cc ext/pgsql/pgsql.c
index ea1a314395d4dc72656c793f610efbcfbbb66434,4bc20bc142a7fabbf2ea5a435971e93165e18f6d..e27bd22ecac099712f60151817fdc8da5777e3ee
--- 1/ext/pgsql/pgsql.c
--- 2/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;