diff options
author | Dmitry Stogov <dmitry@zend.com> | 2013-03-14 14:19:41 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2013-03-14 14:19:41 +0400 |
commit | dd1c358d1bf8fd492e39d46f93878d47a3b6d257 (patch) | |
tree | 5c8923188500c17d085a289a0c70f610f521b9cb /ext/pcre/php_pcre.c | |
parent | d77c865aff794826f6286c078268db6a005fea33 (diff) | |
parent | c09652c2899dd4149fe3187b5b50f6b3c54da384 (diff) | |
download | php-git-dd1c358d1bf8fd492e39d46f93878d47a3b6d257.tar.gz |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
fix the fix
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
Forgot to remove some now unused variables
Add support for non-scalar Iterator keys in foreach
fixed headers order
- Updated to version 2013.2 (2013b)
fixed the test
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
Disable zend_always_inline in debug build
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions