Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: - Fix ZTS build when HAVE_PQESCAPELITERAL is not set Update NEWS Update NEWS
brtriver · Feb 15, 2014 · 8cec20a · 8cec20a
2 parents 5ff9089 + a65a546
commit 8cec20a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -814,6 +814,8 @@ static char* php_pgsql_PQescapeInternal(PGconn *conn, const char *str, size_t le
 				!strncmp(encoding, "GBK", sizeof("GBK")-1) ||
 				!strncmp(encoding, "JOHAB", sizeof("JOHAB")-1) ||
 				!strncmp(encoding, "UHC", sizeof("UHC")-1) ) {
+				TSRMLS_FETCH();
+
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsafe encoding is used. Do not use '%s' encoding or use PostgreSQL 9.0 or later libpq.", encoding);
 			}
 			/* check backslashes */