Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improved ineritance codePRE_PHP7_EREG_MYSQL_REMOVALS | Dmitry Stogov | 2015-03-04 | 2 | -44/+69 |
| | |||||
* | Merge branch 'PHP-5.6' | Daniel Lowrey | 2015-03-04 | 4 | -6/+77 |
|\ | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #68920 (use strict peer_fingerprint input checks) Conflicts: ext/openssl/xp_ssl.c | ||||
| * | Fixed bug #68920 (use strict peer_fingerprint input checks) | Daniel Lowrey | 2015-03-04 | 4 | -8/+82 |
| | | |||||
* | | fix ini registry handling | Anatol Belski | 2015-03-04 | 1 | -11/+17 |
| | | |||||
* | | Merge commit 'refs/pull/1066/head' of git://github.com/php/php-src | Dmitry Stogov | 2015-03-04 | 3 | -2/+20 |
|\ \ | | | | | | | | | | | | | | | | | | | * git://github.com/php/php-src: Add zend assert deleted by accident Let's keep it simple Improve internal function return types checking for parent | ||||
| * | | Add zend assert deleted by accident | Reeze Xia | 2015-02-07 | 1 | -0/+1 |
| | | | |||||
| * | | Let's keep it simple | Reeze Xia | 2015-02-07 | 1 | -10/+1 |
| | | | |||||
| * | | Improve internal function return types checking for parent | Reeze Xia | 2015-02-07 | 3 | -2/+28 |
| | | | | | | | | | | | | | | | | | | | | | Previously the checking was against 'self', 'parent' need to be checked as user land declearation as well. This also add two missing test cases. | ||||
* | | | Merge commit 'refs/pull/1137/head' of git://github.com/php/php-src | Dmitry Stogov | 2015-03-04 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | * git://github.com/php/php-src: Optimize class constant declare compilation | ||||
| * | | | Optimize class constant declare compilation | Reeze Xia | 2015-03-03 | 1 | -5/+5 |
| | | | | |||||
* | | | | Merge branch 'pull-request/1128' | Dmitry Stogov | 2015-03-04 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * pull-request/1128: Fixed memleak in alloc_globals_ctor | ||||
| * | | | | Fixed memleak in alloc_globals_ctor | Reeze Xia | 2015-02-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | This free operation is missed when new MM was introduced in master. | ||||
* | | | | | Improved code for class property inheritance | Dmitry Stogov | 2015-03-04 | 8 | -91/+144 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://git.php.net/repository/php-src | Xinchen Hui | 2015-03-04 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | ensure the mail() socket is not leaked after request | Anatol Belski | 2015-03-04 | 1 | -0/+6 |
| | | | | | | |||||
* | | | | | | Add test for previously fixed segfault | Xinchen Hui | 2015-03-04 | 1 | -0/+22 |
|/ / / / / | |||||
* | | | | | Fixed segfault | Xinchen Hui | 2015-03-04 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2015-03-04 | 2 | -2/+22 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fixed bug #69159 (Opcache causes problem when passing a variable variable to ↵ | Xinchen Hui | 2015-03-04 | 3 | -2/+24 |
| | | | | | | | | | | | | | | | | | | | | a function) | ||||
* | | | | | indent | Xinchen Hui | 2015-03-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fixed memleak | Xinchen Hui | 2015-03-04 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://git.php.net/repository/php-src | Xinchen Hui | 2015-03-04 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Silence a empty while loop warning | Reeze Xia | 2015-03-04 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'fix-compile-error' of https://github.com/zxcvdavid/php-src | Xinchen Hui | 2015-03-04 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix compile error | zxcvdavid | 2015-03-04 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Fixed wrong type used | Xinchen Hui | 2015-03-04 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Fixed build | Xinchen Hui | 2015-03-04 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Remove the unused vars | zxcvdavid | 2015-03-04 | 1 | -2/+0 |
|/ / / / / | |||||
* | | | | | Use zend_string* instead of char* for opened_patch handling. Avoid ↵ | Dmitry Stogov | 2015-03-04 | 50 | -3047/+3023 |
| | | | | | | | | | | | | | | | | | | | | reallocations and improve string reuse. | ||||
* | | | | | fix thread safety for win32/sendmail | Anatol Belski | 2015-03-03 | 2 | -56/+46 |
| | | | | | |||||
* | | | | | avoid this pointers play | Anatol Belski | 2015-03-03 | 1 | -6/+1 |
| | | | | | |||||
* | | | | | use correct free api | Anatol Belski | 2015-03-03 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Fixed bug #69154 Access violation in php7.dll!_emalloc | Anatol Belski | 2015-03-03 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | one more invalid free | ||||
* | | | | | ensure there is no connection | Anatol Belski | 2015-03-03 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | fix socket leaking and better connection err check | Anatol Belski | 2015-03-03 | 1 | -1/+10 |
| | | | | | |||||
* | | | | | avoid skipif as this indeed should be tested | Anatol Belski | 2015-03-03 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | plus do expect regex .* | ||||
* | | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2015-03-03 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-03-03 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Make killing a locker an ERROR event | nathan r. hruby | 2015-03-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least in apache, killing a locker with SIGKILL from inside opcache prevents the child process from emitting a corresponding log event to the access or error logs, therefore requests are termed with no record. This makes is incredibly difficult to debug problems espically on systems with high counts of cache restarts. Since INFO level is far too noisy for production use, switch the killing to a higher level so we can see it easier. | ||||
* | | | | | | Fix test | Reeze Xia | 2015-03-03 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Microoptimization (avoid reloading from memory) | Dmitry Stogov | 2015-03-03 | 2 | -22/+20 |
| | | | | | | |||||
* | | | | | | Removed deprecated paths. Changed "switch" into series of "if". | Dmitry Stogov | 2015-03-03 | 1 | -23/+13 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'master' of git.php.net:php-src | Reeze Xia | 2015-03-03 | 4 | -4/+44 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git.php.net:php-src: Remove wrong commit committed by accident Fixed bug #69167 (call_user_func does not support references anymore) Fixed #69166 (Assigning array_values() to array does not reset key counter) | ||||
| * | | | | | Remove wrong commit committed by accident | Xinchen Hui | 2015-03-03 | 3 | -17/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of https://git.php.net/repository/php-src | Xinchen Hui | 2015-03-03 | 10 | -44/+248 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed bug #69167 (call_user_func does not support references anymore) | Xinchen Hui | 2015-03-03 | 4 | -2/+42 |
| | | | | | | | |||||
| * | | | | | | Fixed #69166 (Assigning array_values() to array does not reset key counter) | Xinchen Hui | 2015-03-03 | 2 | -1/+18 |
| | | | | | | | |||||
* | | | | | | | Add missing zend_parse_parameters_none() for flush() | Reeze Xia | 2015-03-03 | 1 | -0/+4 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch 'PHP-5.6' | Reeze Xia | 2015-03-03 | 1 | -10/+12 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Improve fix for bug 67741 Conflicts: main/main.c | ||||
| * | | | | | Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 | Reeze Xia | 2015-03-03 | 0 | -0/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.6' of git.php.net:/php-src: |