]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 16 May 2013 17:29:25 +0000 (19:29 +0200)
committerAnatol Belski <ab@php.net>
Thu, 16 May 2013 17:29:25 +0000 (19:29 +0200)
commitd565e8f0eb329cee8430cd79f8e149998b389928
tree7034a3c3c3477c3a6a2d574b5e4fa2936b589024
parent07bd1fac57b1f608c15c5d5ebaa6d9383c7cc564
parent8dec06ea2afbe577191b13152e8f4622a80aeb0c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed error handling for ext/sockets under win
ext/sockets/sockets.c