diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-03-05 10:32:42 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-03-05 10:32:42 +0100 |
| commit | e590aceb5ad05e59896fecfeb645f5a70919f417 (patch) | |
| tree | 9812785c5ac4a8727ab1b2b2fa3b8012f7df7fd8 /ext/mysqli/php_mysqli_structs.h | |
| parent | 9b54901ffbfc1f5eacf3f75bdf01c76c78233264 (diff) | |
| parent | c2a9f73c99065cd8a7d3c08583498053076e1265 (diff) | |
| download | php-git-e590aceb5ad05e59896fecfeb645f5a70919f417.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
# By Anatol Belski (22) and others
# Via Derick Rethans (5) and others
* 'PHP-5.4' of git.php.net:php-src: (176 commits)
NEWS
Fixed Bug #66820 out-of-bounds memory access in fileinfo
Improves fix for memory leak, keep in sync with upstream.
Updated news for #60602
proc_open(): separate environment values that aren't strings
Updated NEWS for #66535
Fixed test case title
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
man page: long option name is --strip, not --stripped
--global have be removed in 5.2
NEWS
test for bug #66762
Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
add news entry
add clear_env option to FPM config
Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
fixed macro
Make sure value is initialized
...
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 1f7e761c40..d2fb34b908 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -116,6 +116,10 @@ typedef struct { BIND_BUFFER param; BIND_BUFFER result; char *query; +#ifndef MYSQLI_USE_MYSQLND + /* used to manage refcount with libmysql (already implement in mysqlnd) */ + zend_object_handle link_handle; +#endif } MY_STMT; typedef struct { |