]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Wed, 19 Sep 2012 01:31:09 +0000 (18:31 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 19 Sep 2012 01:31:09 +0000 (18:31 -0700)
commit4ec1a2ab04051b2768c7f4829137115dbf164133
tree407a412d4527a62318ab5a4d98ec7b8845b3bb04
parent1a5545165145070c356108751bda462bb4363223
parentee172ce3cc65b5cb8ec49020c9579d108aca9ea1
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Merging PR #116
  Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver
  updated libary versions
  split tests for the new zlib version on win
  Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)