diff options
| author | Christopher Jones <sixd@php.net> | 2012-10-18 17:40:15 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-10-18 17:40:15 -0700 |
| commit | 18c077adfc9dbc3cca252941b06b7170ee88aa16 (patch) | |
| tree | 417a7f9d7c7f0b11d9d11d8539173c784404cf5e /ext/standard/php_standard.h | |
| parent | 8effd6fe68b1041537d8670ca2e5d43a6bb80925 (diff) | |
| parent | 51fe5bcd099c167a07c6e1e5202c4700fa1bcecc (diff) | |
| download | php-git-18c077adfc9dbc3cca252941b06b7170ee88aa16.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src: (75 commits)
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
add protection against core dumps if the underlying library returns 0x0 for some reason
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
I forgot that inconsistent is only avaliable in debug mode
Add comments
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems
fix newly introduced segfault
Fixed bug #63248 Load multiple magic files on win
Cover have_ssl=NO and have_ssl=DISABLED
Updating expected output in anticipation of mysqlnd_auth.c path
updated NEWS
Refactor to using a stack based zval instead of dynamic allocation
...
Diffstat (limited to 'ext/standard/php_standard.h')
| -rw-r--r-- | ext/standard/php_standard.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/php_standard.h b/ext/standard/php_standard.h index 483dbc33bc..bccfebe543 100644 --- a/ext/standard/php_standard.h +++ b/ext/standard/php_standard.h @@ -58,6 +58,7 @@ #include "php_versioning.h" #include "php_ftok.h" #include "php_type.h" +#include "php_password.h" #define phpext_standard_ptr basic_functions_module_ptr PHP_MINIT_FUNCTION(standard_filters); |