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

* 'PHP-5.5' of git.php.net:php-src:
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters

Conflicts:
	NEWS

NEWS

@@ -10,6 +10,11 @@ PHP                                                                        NEWS
   . Fixed bug #65911 (scope resolution operator - strange behavior with $this).
     (Bob Weinand)
 
+- 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)
+
+
 17 Oct 2013, PHP 5.5.5
 
 - Core:

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;

sapi/fpm/fpm/fpm_sockets.h

@@ -19,7 +19,7 @@
 #if (__FreeBSD__) || (__OpenBSD__)
 #define FPM_BACKLOG_DEFAULT -1
 #else
-#define FPM_BACKLOG_DEFAULT 128
+#define FPM_BACKLOG_DEFAULT 65535
 #endif
 
 enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);

sapi/fpm/php-fpm.conf.in

@@ -159,8 +159,8 @@ group = @php_fpm_group@
 listen = 127.0.0.1:9000
 
 ; Set listen(2) backlog.
-; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 128
+; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
+;listen.backlog = 65535
 
 ; Set permissions for unix socket, if one is used. In Linux, read/write
 ; permissions must be set in order to allow connections from a web server. Many