]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Wed, 15 Oct 2014 17:42:51 +0000 (19:42 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 15 Oct 2014 17:42:51 +0000 (19:42 +0200)
commitcfa1028d7e3942d6921d2c3ba5fba1be3ea78400
tree707c5780b8d301f615e9ce55efe7c60ed5663741
parent2109f5bfe362fdfe840a7014bd62682de3d95c5c
parent503f8193e804ba1eb0847b4c6148844e50a60427
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"

Conflicts:
ext/openssl/xp_ssl.c
ext/gd/gd.c