diff options
| -rw-r--r-- | ext/pgsql/pgsql.c | 1 | ||||
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | main/php.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index fa78e38e12..7a4f8dbabf 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -162,6 +162,7 @@ _notice_handler(void *arg, const char *message) static int _rollback_transactions(zend_rsrc_list_entry *rsrc) { PGconn *link = (PGconn *)rsrc->ptr; + PGLS_FETCH(); PGG(ignore_notices) = 1; PQexec(link,"BEGIN;ROLLBACK;"); diff --git a/main/main.c b/main/main.c index 43c0c68a9a..84cf9666f6 100644 --- a/main/main.c +++ b/main/main.c @@ -251,7 +251,7 @@ PHP_INI_END() /* True global (no need for thread safety */ static int module_initialized = 0; -void php_log_err(char *log_message) +PHPAPI void php_log_err(char *log_message) { FILE *log_file; char error_time_str[128]; diff --git a/main/php.h b/main/php.h index a87e61490c..f887726746 100644 --- a/main/php.h +++ b/main/php.h @@ -241,7 +241,7 @@ extern char **environ; void phperror(char *error); PHPAPI int php_write(void *buf, uint size); PHPAPI int php_printf(const char *format, ...); -void php_log_err(char *log_message); +PHPAPI void php_log_err(char *log_message); int Debug(char *format, ...); int cfgparse(void); |