diff options
| author | ULF WENDEL <uw@php.net> | 2012-10-23 11:18:43 +0200 |
|---|---|---|
| committer | ULF WENDEL <uw@php.net> | 2012-10-23 11:18:43 +0200 |
| commit | 84ab603fc783689f38c6d0047d85a3c7bb031ae4 (patch) | |
| tree | dd91513b03448f733620d7ed255dc5586d757f74 /ext/mysql/php_mysql.c | |
| parent | 7d9114f2b2f271eeb43a910b310cc972f8b8368d (diff) | |
| parent | f734c0a7ca7913dd70e0e60f331618d94ecdbf65 (diff) | |
| download | php-git-84ab603fc783689f38c6d0047d85a3c7bb031ae4.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
merged changes for bug #63297 from 5.3
fixed a typo in the error message
Fixed bug #63297 Phar fails to write an openssl based signature
enabled libxpm for gd on windows
enabled libxpm for gd on windows
Add missed file
Use if_nametoindex in Vista
Update test script
Test for #63336, xfail now
Fixed bug #63305 (zend_mm_heap corrupted with traits)
fix crashes in newly introduced macros when normal trace is disabled but memory traced is enabled.
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions