Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

Author: derickr

NEWS

@@ -16,6 +16,10 @@ PHP                                                                        NEWS
 - FTP:
   . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)
 
+- ODBC
+  . Fixed bug #65950 (Field name truncation if the field name is bigger than 
+    32 characters). (patch submitted by: michael dot y at zend dot com, Yasuo)
+
 - Sockets:
   . Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
     (Mike)

ext/odbc/php_odbc_includes.h

@@ -232,7 +232,7 @@ typedef struct odbc_connection {
 } odbc_connection;
 
 typedef struct odbc_result_value {
-	char name[32];
+	char name[256];
 	char *value;
 	SQLLEN vallen;
 	SQLLEN coltype;