From: Stanislav Malyshev <stas@php.net>
Date: Tue, 4 Jun 2013 04:59:09 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC3~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74e52eaea9c9d030dd70cf915b6f506065741dca;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  news for dblib fixes
  Fix PDO_DBLIB bugs: #64338, #64808, #63638

Conflicts:
	ext/pdo_dblib/dblib_driver.c
	ext/pdo_dblib/dblib_stmt.c
---

74e52eaea9c9d030dd70cf915b6f506065741dca
diff --cc NEWS
index 25e3b205bb,133a202cb7..3d3b6c8cb8
--- a/NEWS
+++ b/NEWS
@@@ -1,18 -1,18 +1,26 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.17
 +?? ??? 2013, PHP 5.5.0 Release Candidate 3
  
 -- FPM:
 +-FPM:
    . Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi)
  
 +- GD:
 +  . Fixed Bug #64961 (segfault in imagesetinterpolation). (Remi)
 +  . Fixed Bug #64962 (imagerotate produces corrupted image). (Remi)
 +
 +- Hash:
 +  . Fixed Bug #64745 (hash_pbkdf2() truncates data when using default length
 +    and hex output). (Anthony Ferrara)
 +
+ - PDO_DBlib:
 -  . Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib). 
++  . Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib).
+     (Stanley Sufficool)
 -  . Fixed bug #64338 (pdo_dblib can't connect to Azure SQL). (Stanley 
++  . Fixed bug #64338 (pdo_dblib can't connect to Azure SQL). (Stanley
+     Sufficool)
 -  . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed 
++  . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed
+     statement crashes). (Stanley Sufficool)
+ 
  - PDO_pgsql:
    . Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi)