- PHP 5.3.8php-5.3.8

13 files changed, 30 insertions, 106 deletions

diff --git a/NEWS b/NEWS
index e5f48dd4b8..db7cc09d3a 100644
--- a/NEWS
+++ b/NEWS
@@ -4,16 +4,11 @@ PHP                                                                        NEWS
 
 - Core:
   . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas)
-  . Fixed bug #52461 (Incomplete doctype and missing xmlns). 
-    (virsacer at web dot de, Pierre)
-
-- NSAPI SAPI:
-  . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403). (Uwe
-    Schindler)
 
 - OpenSSL:
-  . Reverted a change in timeout handling restoring PHP 5.3.6 behavior. (Pierre,
-    Andrey, Johannes)
+  . Reverted a change in timeout handling restoring PHP 5.3.6 behavior,
+    as the new behavior caused mysqlnd SSL connections to hang (#55283).
+    (Pierre, Andrey, Johannes)
 
 18 Aug 2011, PHP 5.3.7
 - Upgraded bundled SQLite to version 3.7.7.1. (Scott)
@@ -175,6 +170,10 @@ PHP                                                                        NEWS
   . Fixed bug #55169 (mcrypt_create_iv always fails to gather sufficient random 
     data on Windows). (Pierre)
 
+- MySQL Improved extension:
+  . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi queries).
+    (Andrey)
+
 - mysqlnd
   . Fixed crash when using more than 28,000 bound parameters. Workaround is to
     set mysqlnd.net_cmd_buffer_size to at least 9000. (Andrey)
@@ -184,8 +183,6 @@ PHP                                                                        NEWS
 - MySQLi extension:
   . Fixed bug #55283 (SSL options set by mysqli_ssl_set ignored for MySQLi
     persistent connections). (Andrey)
-  . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi queries).
-    (Andrey)
 
 - OpenSSL extension:
   . openssl_encrypt()/openssl_decrypt() truncated keys of variable length
diff --git a/acinclude.m4 b/acinclude.m4
index 5515b3f03d..c52e9cb963 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2256,7 +2256,7 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[
     KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi`
     KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi`
 
-    if test -n "$KERBEROS_LIBS"; then
+    if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then
       found_kerberos=yes
       PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
       PHP_EVAL_INCLINE($KERBEROS_CFLAGS)
diff --git a/ext/date/tests/DateTime_data-spring-type2-type2.inc b/ext/date/tests/DateTime_data-spring-type2-type2.inc
index d9e07c3130..3556b207b3 100644
--- a/ext/date/tests/DateTime_data-spring-type2-type2.inc
+++ b/ext/date/tests/DateTime_data-spring-type2-type2.inc
@@ -99,11 +99,11 @@ $start = new DateTime('2010-03-15 18:57:55 EDT');  // sp post, zt2
 examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0);
 
 echo "test_time_spring_type2_stsec_type2_dtsec: ";
-$end   = new DateTime('2010-03-14 03:00:00 EDT');  // dtsec, zt2
-$start = new DateTime('2010-03-14 01:59:59 EST');  // stsec, zt2
+$end   = new DateTime('2010-03-15 03:00:00 EDT');  // dtsec, zt2
+$start = new DateTime('2010-03-13 01:59:59 EST');  // stsec, zt2
 examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0);
 
 echo "test_time_spring_type2_dtsec_type2_stsec: ";
-$end   = new DateTime('2010-03-14 01:59:59 EST');  // stsec, zt2
-$start = new DateTime('2010-03-14 03:00:00 EDT');  // dtsec, zt2
+$end   = new DateTime('2010-03-15 01:59:59 EST');  // stsec, zt2
+$start = new DateTime('2010-03-13 03:00:00 EDT');  // dtsec, zt2
 examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0);
diff --git a/ext/date/tests/DateTime_data-spring-type2-type3.inc b/ext/date/tests/DateTime_data-spring-type2-type3.inc
index d66fc51778..b06825837c 100644
--- a/ext/date/tests/DateTime_data-spring-type2-type3.inc
+++ b/ext/date/tests/DateTime_data-spring-type2-type3.inc
@@ -99,11 +99,11 @@ $start = new DateTime('2010-03-15 18:57:55 EDT');  // sp post, zt2
 examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0);
 
 echo "test_time_spring_type2_stsec_type3_dtsec: ";
-$end   = new DateTime('2010-03-14 03:00:00');  // dtsec, zt3
-$start = new DateTime('2010-03-14 01:59:59 EST');  // stsec, zt2
+$end   = new DateTime('2010-03-15 03:00:00');  // dtsec, zt3
+$start = new DateTime('2010-03-13 01:59:59 EST');  // stsec, zt2
 examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0);
 
 echo "test_time_spring_type2_dtsec_type3_stsec: ";
-$end   = new DateTime('2010-03-14 01:59:59');  // stsec, zt3
-$start = new DateTime('2010-03-14 03:00:00 EDT');  // dtsec, zt2
+$end   = new DateTime('2010-03-15 01:59:59');  // stsec, zt3
+$start = new DateTime('2010-03-13 03:00:00 EDT');  // dtsec, zt2
 examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0);
diff --git a/ext/date/tests/DateTime_data-spring-type3-type2.inc b/ext/date/tests/DateTime_data-spring-type3-type2.inc
index 92211f4b1a..244cd58819 100644
--- a/ext/date/tests/DateTime_data-spring-type3-type2.inc
+++ b/ext/date/tests/DateTime_data-spring-type3-type2.inc
@@ -99,11 +99,11 @@ $start = new DateTime('2010-03-15 18:57:55');  // sp post, zt3
 examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0);
 
 echo "test_time_spring_type3_stsec_type2_dtsec: ";
-$end   = new DateTime('2010-03-14 03:00:00 EDT');  // dtsec, zt2
-$start = new DateTime('2010-03-14 01:59:59');  // stsec, zt3
+$end   = new DateTime('2010-03-15 03:00:00 EDT');  // dtsec, zt2
+$start = new DateTime('2010-03-13 01:59:59');  // stsec, zt3
 examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0);
 
 echo "test_time_spring_type3_dtsec_type2_stsec: ";
-$end   = new DateTime('2010-03-14 01:59:59 EST');  // stsec, zt2
-$start = new DateTime('2010-03-14 03:00:00');  // dtsec, zt3
+$end   = new DateTime('2010-03-15 01:59:59 EST');  // stsec, zt2
+$start = new DateTime('2010-03-13 03:00:00');  // dtsec, zt3
 examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0);
diff --git a/ext/date/tests/DateTime_data-spring-type3-type3.inc b/ext/date/tests/DateTime_data-spring-type3-type3.inc
index de1dee12e6..d87373c5a4 100644
--- a/ext/date/tests/DateTime_data-spring-type3-type3.inc
+++ b/ext/date/tests/DateTime_data-spring-type3-type3.inc
@@ -99,11 +99,11 @@ $start = new DateTime('2010-03-15 18:57:55');  // sp post, zt3
 examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0);
 
 echo "test_time_spring_type3_stsec_type3_dtsec: ";
-$end   = new DateTime('2010-03-14 03:00:00');  // dtsec, zt3
-$start = new DateTime('2010-03-14 01:59:59');  // stsec, zt3
+$end   = new DateTime('2010-03-15 03:00:00');  // dtsec, zt3
+$start = new DateTime('2010-03-13 01:59:59');  // stsec, zt3
 examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0);
 
 echo "test_time_spring_type3_dtsec_type3_stsec: ";
-$end   = new DateTime('2010-03-14 01:59:59');  // stsec, zt3
-$start = new DateTime('2010-03-14 03:00:00');  // dtsec, zt3
+$end   = new DateTime('2010-03-15 01:59:59');  // stsec, zt3
+$start = new DateTime('2010-03-13 03:00:00');  // dtsec, zt3
 examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0);
diff --git a/ext/date/tests/DateTime_days-spring-type2-type2.phpt b/ext/date/tests/DateTime_days-spring-type2-type2.phpt
index 3e702ace09..3f9c353523 100644
--- a/ext/date/tests/DateTime_days-spring-type2-type2.phpt
+++ b/ext/date/tests/DateTime_days-spring-type2-type2.phpt
@@ -27,5 +27,5 @@ test_time_spring_type2_post_type2_prev: DAYS: **2**
 test_time_spring_type2_post_type2_st: DAYS: **1**
 test_time_spring_type2_post_type2_dt: DAYS: **1**
 test_time_spring_type2_post_type2_post: DAYS: **0**
-test_time_spring_type2_stsec_type2_dtsec: DAYS: **0**
+test_time_spring_type2_stsec_type2_dtsec: DAYS: **0** 
 test_time_spring_type2_dtsec_type2_stsec: DAYS: **0**
diff --git a/ext/date/tests/DateTime_days-spring-type2-type3.phpt b/ext/date/tests/DateTime_days-spring-type2-type3.phpt
index 0e23ac3e2c..77ac5fdb6d 100644
--- a/ext/date/tests/DateTime_days-spring-type2-type3.phpt
+++ b/ext/date/tests/DateTime_days-spring-type2-type3.phpt
@@ -27,5 +27,5 @@ test_time_spring_type2_post_type3_prev: DAYS: **2**
 test_time_spring_type2_post_type3_st: DAYS: **1**
 test_time_spring_type2_post_type3_dt: DAYS: **1**
 test_time_spring_type2_post_type3_post: DAYS: **0**
-test_time_spring_type2_stsec_type3_dtsec: DAYS: **0**
+test_time_spring_type2_stsec_type3_dtsec: DAYS: **0** 
 test_time_spring_type2_dtsec_type3_stsec: DAYS: **0**
diff --git a/ext/date/tests/DateTime_days-spring-type3-type2.phpt b/ext/date/tests/DateTime_days-spring-type3-type2.phpt
index 4fb9ba76d2..09aa8d9c1d 100644
--- a/ext/date/tests/DateTime_days-spring-type3-type2.phpt
+++ b/ext/date/tests/DateTime_days-spring-type3-type2.phpt
@@ -27,5 +27,5 @@ test_time_spring_type3_post_type2_prev: DAYS: **2**
 test_time_spring_type3_post_type2_st: DAYS: **1**
 test_time_spring_type3_post_type2_dt: DAYS: **1**
 test_time_spring_type3_post_type2_post: DAYS: **0**
-test_time_spring_type3_stsec_type2_dtsec: DAYS: **0**
+test_time_spring_type3_stsec_type2_dtsec: DAYS: **0** 
 test_time_spring_type3_dtsec_type2_stsec: DAYS: **0**
diff --git a/ext/date/tests/DateTime_days-spring-type3-type3.phpt b/ext/date/tests/DateTime_days-spring-type3-type3.phpt
index df44925fbd..f947329dea 100644
--- a/ext/date/tests/DateTime_days-spring-type3-type3.phpt
+++ b/ext/date/tests/DateTime_days-spring-type3-type3.phpt
@@ -27,5 +27,5 @@ test_time_spring_type3_post_type3_prev: DAYS: **2**
 test_time_spring_type3_post_type3_st: DAYS: **1**
 test_time_spring_type3_post_type3_dt: DAYS: **1**
 test_time_spring_type3_post_type3_post: DAYS: **0**
-test_time_spring_type3_stsec_type3_dtsec: DAYS: **0**
+test_time_spring_type3_stsec_type3_dtsec: DAYS: **0** 
 test_time_spring_type3_dtsec_type3_stsec: DAYS: **0**
diff --git a/ext/mysql/tests/bug55473.phpt b/ext/mysql/tests/bug55473.phpt
deleted file mode 100644
index d492e68349..0000000000
--- a/ext/mysql/tests/bug55473.phpt
+++ /dev/null
@@ -1,71 +0,0 @@
---TEST--
-Bug #5547 (mysql_pconnect leaks file descriptors on reconnect)
---SKIPIF--
-<?php
-require_once('skipif.inc');
-require_once('skipifconnectfailure.inc');
-if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
-	die("skip Test doesn't work on Windows");
-}
-?>
---INI--
-mysql.max_persistent=30
-mysql.allow_persistent=1
---FILE--
-<?php
-	include "connect.inc";
-
-	$tmp    = NULL;
-	$link   = NULL;
-
-	function connect($host, $user, $passwd) {
-		$conn = mysql_pconnect($host, $user, $passwd);
-		if (!$conn)
-			die(mysql_error()."\n");
-		mysql_query("set wait_timeout=1", $conn);
-		return $conn;
-	}	
-
-	$conn = connect($host, $user, $passwd);
-	$opened_files = -1;
-	for($i = 0; $i < 4; $i++) {
-		/* wait while mysql closes connection */
-		sleep(3);
-
-		if (!mysql_ping($conn)) {
-			echo "reconnect\n";
-			$conn = connect($host, $user, $passwd);
-		}
-
-		$r = mysql_query('select 1', $conn);
-		$error = $r ? 'OK' : mysql_error();
-		if ($opened_files == -1) {
-			$opened_files = trim(exec("lsof -np " . getmypid() . " | wc -l"));
-			echo "OK\n";
-		} else if (($tmp = trim(exec("lsof -np " . getmypid() . " | wc -l"))) != $opened_files) {
-			printf("[01] [%d] different number of opened_files : expected %d, got %d", $i, $opened_files, $tmp);
-		} else {
-			echo "OK\n";
-		}
-	}
-
-
-	print "done!";
-?>
---EXPECTF--
-Warning: mysql_ping(): MySQL server has gone away in %s on line %d
-reconnect
-OK
-
-Warning: mysql_ping(): MySQL server has gone away in %s on line %d
-reconnect
-OK
-
-Warning: mysql_ping(): MySQL server has gone away in %s on line %d
-reconnect
-OK
-
-Warning: mysql_ping(): MySQL server has gone away in %s on line %d
-reconnect
-OK
-done!
\ No newline at end of file
diff --git a/ext/standard/info.c b/ext/standard/info.c
index a07ccee149..90ae34f0bc 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -626,7 +626,7 @@ PHPAPI void php_print_info_htmlhead(TSRMLS_D)
 
 
 	PUTS("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"DTD/xhtml1-transitional.dtd\">\n");
-	PUTS("<html xmlns=\"http://www.w3.org/1999/xhtml\">>");
+	PUTS("<html>");
 	PUTS("<head>\n");
 	php_info_print_style(TSRMLS_C);
 	PUTS("<title>phpinfo()</title>");
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 85a6767264..13d0209f58 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -727,9 +727,7 @@ static void sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_D
 	nsapi_free(value);
 
 	php_register_variable("SERVER_SOFTWARE", system_version(), track_vars_array TSRMLS_CC);
-	if (security_active) {
-		php_register_variable("HTTPS", "ON", track_vars_array TSRMLS_CC);
-	}
+	php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array TSRMLS_CC);
 	php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC);
 
 	/* DOCUMENT_ROOT */