diff options
| author | Felipe Pena <felipensp@gmail.com> | 2014-02-15 11:05:08 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2014-02-15 11:05:08 -0200 |
| commit | a65a54664066b69663d51726c64d3ff0e940f5c4 (patch) | |
| tree | b46c8bcb64f9ee1c763a1cfe8ee820bcaa7a5e1e | |
| parent | fbb1827da840bfeca4f0be87dacc52c7631c0dce (diff) | |
| parent | 9d84f6c06ec59e8fc23b715c08fba2eaf451868a (diff) | |
| download | php-git-a65a54664066b69663d51726c64d3ff0e940f5c4.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fix ZTS build when HAVE_PQESCAPELITERAL is not set
Update NEWS
| -rw-r--r-- | ext/pgsql/pgsql.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index a39b4e6ecb..97f61db860 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -804,6 +804,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 */ |