Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  PDO_MySQL: Differentiate between linux and win32 when passing unix_socket

ext/pdo_mysql/mysql_driver.c

@@ -743,9 +743,14 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 	if(vars[3].optval) {
 		port = atoi(vars[3].optval);
 	}
-	if (vars[2].optval && !strcmp("localhost", vars[2].optval)) {
-		unix_socket = vars[4].optval;  
-	}
+
+#ifdef PHP_WIN32
+	if (vars[2].optval && !strcmp(".", vars[2].optval)) {
+#else
+    if (vars[2].optval && !strcmp("localhost", vars[2].optval)) {
+#endif
+        unix_socket = vars[4].optval;
+    }
 
 	/* TODO: - Check zval cache + ZTS */
 #ifdef PDO_USE_MYSQLND