6b8d5b01bc
Add test for previously fixed segfault
2015-03-04 18:26:58 +08:00
c16dcd3a8e
Fixed segfault
2015-03-04 17:17:48 +08:00
ec00a4de4e
Merge branch 'PHP-5.6'
2015-03-04 14:49:03 +08:00
a29b64fc10
Fixed bug #69159 (Opcache causes problem when passing a variable variable to a function)
2015-03-04 14:48:41 +08:00
fffd173b7a
indent
2015-03-04 12:10:23 +08:00
a6ba7966de
Fixed memleak
2015-03-04 12:08:54 +08:00
4ebfc02274
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-04 11:43:04 +08:00
abfdf3bf52
Merge branch 'fix-compile-error' of https://github.com/zxcvdavid/php-src
2015-03-04 11:39:53 +08:00
2dac92b244
Silence a empty while loop warning
2015-03-04 11:34:53 +08:00
2fa4d1d88b
Fixed wrong type used
2015-03-04 10:55:14 +08:00
c7b7cc4c16
Fixed build
2015-03-04 10:49:55 +08:00
a4a85887e0
Fix compile error
2015-03-04 09:56:50 +08:00
f1de275e74
Remove the unused vars
2015-03-04 09:52:09 +08:00
2fa8d67a5c
Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.
2015-03-04 02:05:28 +03:00
2841aa95db
fix thread safety for win32/sendmail
2015-03-03 20:42:28 +01:00
82fd62df19
avoid this pointers play
2015-03-03 19:30:15 +01:00
2f79fd8d43
use correct free api
2015-03-03 18:09:28 +01:00
cddde315c7
Fixed bug #69154 Access violation in php7.dll!_emalloc
...
one more invalid free
2015-03-03 17:19:17 +01:00
3483cc2cf6
ensure there is no connection
2015-03-03 17:19:16 +01:00
74813e6f04
fix socket leaking and better connection err check
2015-03-03 17:19:15 +01:00
dcb944b352
avoid skipif as this indeed should be tested
...
plus do expect regex .*
2015-03-03 17:19:14 +01:00
4ccbb1ed33
Merge branch 'PHP-5.6'
2015-03-03 23:17:49 +08:00
6183408031
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-03 23:17:37 +08:00
837eeefee9
Make killing a locker an ERROR event
...
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.
2015-03-03 23:16:45 +08:00
31d5b65c74
Fix test
2015-03-03 22:56:23 +08:00
b4e9da22d7
Microoptimization (avoid reloading from memory)
2015-03-03 16:51:27 +03:00
6b9c40280a
Removed deprecated paths. Changed "switch" into series of "if".
2015-03-03 16:49:45 +03:00
bc28ed6788
Merge branch 'master' of git.php.net:php-src
...
* '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)
2015-03-03 18:38:28 +08:00
f97251adec
Add missing zend_parse_parameters_none() for flush()
2015-03-03 18:37:47 +08:00
aa63449b6e
Remove wrong commit committed by accident
2015-03-03 18:29:26 +08:00
2702739ceb
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-03 18:16:46 +08:00
7ad6711a4d
Fixed bug #69167 (call_user_func does not support references anymore)
2015-03-03 18:11:56 +08:00
70bd500645
Fixed #69166 (Assigning array_values() to array does not reset key counter)
2015-03-03 17:31:20 +08:00
bb2e62ecda
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Improve fix for bug 67741
Conflicts:
main/main.c
2015-03-03 16:29:41 +08:00
808e562f23
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:/php-src:
2015-03-03 16:28:01 +08:00
6cb3b941df
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Improve fix for bug 67741
Added type checks
Added type checks
2015-03-03 16:27:35 +08:00
304fb7a3d6
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:/php-src:
Added type checks
Added type checks
2015-03-03 16:27:04 +08:00
860fc3947f
Improve fix for bug 67741
...
Thanks to laruence.
2015-03-03 16:25:43 +08:00
143cc67282
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added type checks
Update NEWS
Conflicts:
NEWS
ext/soap/php_encoding.c
ext/soap/soap.c
2015-03-03 10:56:11 +03:00
c433f19a6b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added type checks
2015-03-03 10:46:55 +03:00
b3ac352253
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added type checks
2015-03-03 10:45:07 +03:00
c8eaca013a
Added type checks
2015-03-03 10:43:48 +03:00
5c03e05692
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Update NEWS
2015-03-03 10:20:21 +03:00
66c883c0fd
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Update NEWS
2015-03-03 10:19:54 +03:00
dd50ed8a34
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added type checks
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
Check variable type before its usage as IS_ARRAY.
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
Conflicts:
ext/soap/php_encoding.c
ext/soap/php_http.c
ext/soap/soap.c
2015-03-03 10:19:12 +03:00
26827a0111
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added type checks
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
Check variable type before its usage as IS_ARRAY.
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-03-03 09:59:32 +03:00
035d80523f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added type checks
Conflicts:
ext/soap/soap.c
2015-03-03 09:52:21 +03:00
0c136a2abd
Added type checks
2015-03-03 09:44:46 +03:00
f353162ca2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
Check variable type before its usage as IS_ARRAY.
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
Conflicts:
NEWS
2015-03-03 14:37:06 +08:00
bb466d57ae
Update NEWS
2015-03-03 14:22:03 +08:00
Xinchen Hui