3e31838d19
zend_read_property() has to provide a holder for return value.
...
Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
2015-01-22 11:50:42 +03:00
295926855b
Slightly modify and merge PR#105 from @MegaManSec
2015-01-21 11:39:23 -08:00
1b53a99fbf
Remove dead codes
2015-01-19 10:46:59 -05:00
a29601a2b4
Weird, is nobody compiling this?
2015-01-15 17:44:11 -08:00
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
2193de0d18
Faster sorting algo
2015-01-14 18:02:41 +08:00
d805fa0d81
Fixed #68790 (Missing return)
2015-01-10 22:19:49 -05:00
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
dbd02ad23b
Fix bug #68784
2015-01-09 18:09:44 -08:00
50c721a623
These tests all assume that IPV6 is available.
2015-01-09 17:24:48 -08:00
1b5e87862f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
cleanup old unused typedef
2015-01-06 11:07:10 +01:00
0ba32e5cf9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
cleanup old unused typedef
2015-01-06 11:06:53 +01:00
8404f8ac2a
cleanup old unused typedef
2015-01-06 11:06:25 +01:00
a607a1db1d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.
Conflicts:
sapi/cli/php_cli_server.c
2015-01-06 01:29:40 +00:00
27ff425b78
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.
Conflicts:
sapi/cli/tests/php_cli_server.inc
2015-01-06 01:27:37 +00:00
448ef30f75
Handle NULL strings in sapi_cli_server_register_variable().
...
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
2015-01-06 01:23:27 +00:00
0cc2810498
Allow CLI server test scripts to specify the name of the router file.
...
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
2015-01-06 01:22:59 +00:00
e7cdf9df7c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:36:26 +01:00
eb1a1d5feb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:35:14 +01:00
1b6d076244
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:33:57 +01:00
28985e982b
Still -1 on *BSD now
2015-01-04 22:08:35 -05:00
80c0a02286
This is 511 now ( ebf4ffc935)
2015-01-04 22:04:32 -05:00
73d74ac54c
Merge branch 'pull-request/731'
...
* pull-request/731:
Set FPM_BACKLOG_DEFAULT to 511
2015-01-04 19:00:05 -08:00
16b904cc1c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
FIx bug #68618 (out of bounds read crashes php-cgi)
Fixed bug #68676 (Explicit Double Free)
Fixed bug #68676 (Explicit Double Free)
2014-12-30 01:27:20 -08:00
4c0f17caca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
FIx bug #68618 (out of bounds read crashes php-cgi)
Fixed bug #68676 (Explicit Double Free)
2014-12-30 01:26:53 -08:00
71c970077d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
FIx bug #68618 (out of bounds read crashes php-cgi)
2014-12-30 01:26:00 -08:00
f9ad308669
FIx bug #68618 (out of bounds read crashes php-cgi)
2014-12-30 01:23:05 -08:00
f579ae81c9
Fixed build of litespped
2014-12-29 13:46:01 +08:00
2d212b426a
Drop duplicate arg from hash_get_current_key_ex
2014-12-26 21:06:18 +01:00
8cd8c2ccfb
Fixed warning
2014-12-22 23:39:32 +08:00
b5b617674e
Micro optimaztion (yeah, I know compiler supposed to do that)
2014-12-22 00:10:46 -05:00
e20cbdbe97
Unify HTTP status code maps
2014-12-21 03:12:39 +00:00
8122bee654
enable static tsrmls cache in the embed SAPI
2014-12-17 10:58:31 +01:00
af21b3b6dc
get rid of TSRMLS_* in the embed SAPI
2014-12-17 10:52:28 +01:00
89f87576a1
various fixes for removing explicit tsrm_ls usage
2014-12-16 12:56:00 +01:00
9d70df24f8
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master:
C89 fixes
use portable struct stat
fixed macro va args expansion for vs
2014-12-16 12:22:27 +01:00
673003757f
C89 fixes
2014-12-16 12:20:59 +01:00
bee4a28433
use portable struct stat
2014-12-16 12:20:58 +01:00
f1d1185c64
fixed macro va args expansion for vs
2014-12-16 12:20:57 +01:00
a85eb75cba
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master:
fix perm again...
cleanup uneeded cast
fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian)
Conflicts:
ext/phar/func_interceptors.c
ext/phar/phar_object.c
sapi/apache2handler/sapi_apache2.c
2014-12-16 10:21:05 +01:00
61cb019e20
cleanup uneeded cast
2014-12-16 10:06:32 +01:00
f62ad3bc57
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functions
Fixed test
small fixes to UPGRADING
Reorder to save alignment size (of course, only for common used structs)
2014-12-15 13:57:43 +01:00
178363cbff
made the apache ini holders to be zend_bool
...
since they're documented to be so and we spare 16 byte
2014-12-15 13:49:46 +01:00
7950429626
Revert HTTP status codes merger
...
This reverts commits 65768edcf3627b350f319c18ad3ac9
2014-12-15 01:30:58 +00:00
9c18ad3ac9
fixed tests, bugs in status codes merger
2014-12-14 23:41:11 +00:00
d450f6aabc
Merge branch 'unify_http'
...
* unify_http:
Share HTTP status codes map
2014-12-14 19:18:23 +00:00
65768edcf3
Share HTTP status codes map
2014-12-14 19:16:51 +00:00
a857f3a147
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master:
Fix bug #67106 split main fpm config
split fpm config to two parts. PR#903
fix typo
Fix undefined behaviour in strnatcmp
Fix undefined behaviour in strnatcmp
Fixed memory leak introduced by 73458e8f#68545 NULL pointer dereference in unserialize.c
2014-12-14 19:44:24 +01:00
9f189dd290
split fpm config to two parts. PR#903
...
main config = global options
secondary config = pool options
makes easier to add new pools:
duplicate pool config in fpm.d dir
https://bugs.php.net/bug.php?id=67106
2014-12-14 14:21:46 +01:00
e112f6a04e
second shot on removing TSRMLS_*
2014-12-14 14:07:59 +01:00
Dmitry Stogov