]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e18f11 657547f)
Merge branch 'PHP-5.3' into PHP-5.4
authorDmitry Stogov <dmitry@zend.com>
Wed, 21 Mar 2012 12:42:08 +0000 (16:42 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 21 Mar 2012 12:42:08 +0000 (16:42 +0400)
commita8cc0b05b45110ccf408ea9410447bf82b8826f2
treee0cae83e715042a6122cac2fbe736f48158a94aetree | snapshot
parent1e18f11c9ab56fb120c9e26ecd3f68f0651cdddecommit | diff
parent657547f8c4758efcf85c73fec6d7fd8b3983d7cbcommit | diff
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #49853 (Soap Client stream context header option ignored)

Conflicts:
NEWS
ext/soap/php_sdl.c
NEWS diff1 | diff2 | blob | history
ext/soap/php_http.c diff1 | diff2 | blob | history
ext/soap/php_sdl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.