com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/gd/gd.c

From: Date: Wed, 15 Oct 2014 17:42:51 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/gd/gd.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82359@lists.php.net to get a copy of this message
Commit: cfa1028d7e3942d6921d2c3ba5fba1be3ea78400 Author: Ferenc Kovacs <tyrael@php.net> Wed, 15 Oct 2014 19:42:51 +0200 Parents: 2109f5bfe362fdfe840a7014bd62682de3d95c5c 503f8193e804ba1eb0847b4c6148844e50a60427 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=cfa1028d7e3942d6921d2c3ba5fba1be3ea78400 Log: 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 Bugs: https://bugs.php.net/65171 https://bugs.php.net/41631 Changed paths: MM ext/gd/gd.c Diff:

« previous php.cvs (#82359) next »