diff options
| author | Felipe Pena <felipensp@gmail.com> | 2014-02-15 11:05:25 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2014-02-15 11:05:25 -0200 |
| commit | 8cec20a5656935f6fecd66058513657487b2e7cf (patch) | |
| tree | 51648e25d2cc20809dd41930fed858b2f042cf7e /ext/pgsql/pgsql.c | |
| parent | 5ff9089aeb3145cdaed59668855d135e6fe0ea02 (diff) | |
| parent | a65a54664066b69663d51726c64d3ff0e940f5c4 (diff) | |
| download | php-git-8cec20a5656935f6fecd66058513657487b2e7cf.tar.gz | |
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
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -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 6e64cd29fb..4edbfb3f5f 100644 --- 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 */ |