Stanislav Malyshev
62d6f91b3e
Merge branch 'pull-request/1011'
...
* pull-request/1011:
Fix for a previous commit. i read it as size_t, notssize_t.
Remove useless tests
2015-02-01 00:21:47 -08:00
Joshua Rogers
d492bc8b6b
Fix for a previous commit. i read it as size_t, notssize_t.
2015-02-01 19:02:25 +11:00
Stanislav Malyshev
141b14454c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Conflicts:
ext/sockets/sockaddr_conv.c
ext/standard/dns.c
2015-01-31 21:50:08 -08:00
Stanislav Malyshev
6a960b6d1b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018
Use better constant since MAXHOSTNAMELEN may mean shorter name
2015-01-31 21:46:56 -08:00
Stanislav Malyshev
2cdbd3537f
use right sizeof for memset
2015-01-31 21:30:58 -08:00
Stanislav Malyshev
41bdd6e7cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925 )
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:12:20 -08:00
Stanislav Malyshev
237128603f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:13 -08:00
Stanislav Malyshev
457367e0b6
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:04:55 -08:00
Michael Wallner
130d7320b1
Merge branch 'incorrect_close' of github.com:MegaManSec/php-src
...
* 'incorrect_close' of github.com:MegaManSec/php-src:
Use correct deallocator in phpdbg
2015-01-30 23:11:33 +01:00
Michael Wallner
c0477fbcb5
Squashed commit of the following:
...
commit 5cee14b14b6392e1e59593ba6392e1e86a
2015-01-30 23:01:26 +01:00
Anatol Belski
563e7822fd
fix datatype mismatches, improve error checks
2015-01-30 16:31:19 +01:00
Xinchen Hui
88e13bda6a
Fixed bug #68945 (Unknown admin values segfault pools)
2015-01-30 11:01:42 +08:00
Xinchen Hui
95142d9015
Merge branch 'PHP-5.6'
2015-01-27 22:25:55 +08:00
Xinchen Hui
b881de9937
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:25:45 +08:00
Xinchen Hui
4c5995b172
fcgi_write in fpm returns ssizt_t, but it returns int in cgi
2015-01-27 22:25:38 +08:00
Xinchen Hui
737b6f69e3
Merge branch 'PHP-5.6'
2015-01-27 22:20:17 +08:00
Xinchen Hui
92d56b0af6
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:20:03 +08:00
Xinchen Hui
c3ff9aa17d
Revert previous unintentional change to this
2015-01-27 22:19:11 +08:00
Xinchen Hui
9fdf62d64a
Merge branch 'PHP-5.6'
...
Conflicts:
sapi/cgi/cgi_main.c
2015-01-27 22:15:12 +08:00
Xinchen Hui
6336fa18c4
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:13:04 +08:00
Xinchen Hui
8c2d91761a
Also Fixed #68571 in CGI SAPI, and some cleanup
2015-01-27 22:11:23 +08:00
Xinchen Hui
6c87372199
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
2015-01-27 22:04:23 +08:00
Joshua Rogers
305c03e757
Use correct deallocator in phpdbg
2015-01-27 09:28:54 +11:00
Nikita Popov
e05993dfa2
Remove dl() on fpm-fcgi
2015-01-26 21:00:23 +01:00
Dmitry Stogov
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
Rasmus Lerdorf
e242f871df
Slightly modify and merge PR#105 from @MegaManSec
2015-01-21 11:40:27 -08:00
Rasmus Lerdorf
295926855b
Slightly modify and merge PR#105 from @MegaManSec
2015-01-21 11:39:23 -08:00
Joshua Rogers
eba0e0348e
Remove useless tests
...
Respective variables are unsigned and cannot be <0.
2015-01-21 05:23:28 +11:00
Xinchen Hui
1b53a99fbf
Remove dead codes
2015-01-19 10:46:59 -05:00
Rasmus Lerdorf
a29601a2b4
Weird, is nobody compiling this?
2015-01-15 17:44:11 -08:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Xinchen Hui
2193de0d18
Faster sorting algo
2015-01-14 18:02:41 +08:00
Xinchen Hui
d805fa0d81
Fixed #68790 (Missing return)
2015-01-10 22:19:49 -05:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Rasmus Lerdorf
dbd02ad23b
Fix bug #68784
2015-01-09 18:09:44 -08:00
Rasmus Lerdorf
5065505c93
Fix bug #68784
2015-01-09 18:09:13 -08:00
Rasmus Lerdorf
e4b3d623a2
Fix bug #68784
2015-01-09 18:08:36 -08:00
Rasmus Lerdorf
50c721a623
These tests all assume that IPV6 is available.
2015-01-09 17:24:48 -08:00
Remi Collet
1b5e87862f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
cleanup old unused typedef
2015-01-06 11:07:10 +01:00
Remi Collet
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
Remi Collet
8404f8ac2a
cleanup old unused typedef
2015-01-06 11:06:25 +01:00
Adam Harvey
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
Adam Harvey
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
Adam Harvey
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
Adam Harvey
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
