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

1  2 
ext/gd/gd.c patch | diff1 | diff2 | blob | history

diff --cc ext/gd/gd.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.