php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 08:58:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
87,673 Commits 549 Branches 1,485 Tags
457367e0b612af2da8b92536699dd6e9bb11b310
Commit Graph

3696 Commits

Author SHA1 Message Date
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 5cee14b14b
Merge: 6392e1e 59593ba
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 19:15:48 2015 +0800

    Merge branch 'master' of git://github.com/php/php-src

commit 6392e1e86a
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 11:32:04 2015 +0800

    Remove duplicated line
 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
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
Remi Collet 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
Remi Collet 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
Remi Collet 1b6d076244 Fix bug #68751 listen.allowed_clients is broken 2015-01-05 17:33:57 +01:00
Xinchen Hui 28985e982b Still -1 on *BSD now 2015-01-04 22:08:35 -05:00
Xinchen Hui 80c0a02286 This is 511 now (ebf4ffc935) 2015-01-04 22:04:32 -05:00
Stanislav Malyshev 73d74ac54c Merge branch 'pull-request/731' 
* pull-request/731:
  Set FPM_BACKLOG_DEFAULT to 511
 2015-01-04 19:00:05 -08:00
Stanislav Malyshev 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
Stanislav Malyshev 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
Stanislav Malyshev 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
Stanislav Malyshev f9ad308669 FIx bug #68618 (out of bounds read crashes php-cgi) 2014-12-30 01:23:05 -08:00
Xinchen Hui f579ae81c9 Fixed build of litespped 2014-12-29 13:46:01 +08:00