]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a55451 ee172ce)
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)
* '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)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.