com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: Zend/zend.h Zend/zend_API.c Z
end/zend_ast.c Zend/zend_execute.h Zend/zend_exec ute_API.c Zend/zend_object_handlers.c Zend/zend _vm_def.h Zend/zend_vm_execute.h ext/interbase/
interbase.c ext/json/json.c ext/mysqlnd/mysqlnd_ps. c ext/opcache/ZendAccelerator.c ext/opcache/zend_accele rator_module.c ext/openssl/openssl.c
ext/openssl/xp _ssl.c ext/soa
| From: | Anatol Belski | Date: | Tue, 15 Apr 2014 12:10:50 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: Zend/zend.h Zend/zend_API.c Z end/zend_ast.c Zend/zend_execute.h Zend/zend_exec ute_API.c Zend/zend_object_handlers.c Zend/zend _vm_def.h Zend/zend_vm_execute.h ext/interbase/ interbase.c ext/json/json.c ext/mysqlnd/mysqlnd_ps. c ext/opcache/ZendAccelerator.c ext/opcache/zend_accele rator_module.c ext/openssl/openssl.c ext/openssl/xp _ssl.c ext/soa |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76904@lists.php.net to get a copy of this message | ||
Commit: b504468d78b924325d3e4ef752c48357f9551f4c
Author: Anatol Belski <ab@php.net> Tue, 15 Apr 2014 14:10:50 +0200
Parents: 0eb34f25aeecee5c727b4378778985c1a4874e8e 5e750feb21e8bdf43563938752737e03ea81bdee
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b504468d78b924325d3e4ef752c48357f9551f4c
Log:
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into
str_size_and_int64
* origin/str_size_and_int64_56_backport: (58 commits)
fix datatypes
fix zpp
fixed prototype
fix test - doesn't seem to produce warning
Fix test - on CI somebody could create a process in the meantime
fix windows build
Fix #66942: openssl_seal() memory leak
ws fix
Fix #66942: openssl_seal() memory leak
ws fix
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks
fix crash in MINFO when no mysqlnd plugins are loaded
Add test
backported some ext/intl tests from 5.6 into 5.4
test fixes for ICU 53.1
...
Conflicts:
ext/mysqlnd/mysqlnd_result.c
Bugs:
https://bugs.php.net/66942
https://bugs.php..net/66171
Changed paths:
MM Zend/zend.h
MM Zend/zend_API.c
MM Zend/zend_ast.c
MM Zend/zend_execute.h
MM Zend/zend_execute_API.c
MM Zend/zend_object_handlers.c
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM ext/interbase/interbase.c
MM ext/json/json.c
MM ext/mysqlnd/mysqlnd_ps.c
MM ext/opcache/ZendAccelerator.c
MM ext/opcache/zend_accelerator_module.c
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
MM ext/soap/php_encoding.c
MM ext/standard/array.c
MM ext/standard/basic_functions.c
MM main/SAPI.c
MM main/php_variables.c
MM php.ini-development
MM php.ini-production
Diff: