Fixed Bug #65475

Yasuo Ohgaki · Yasuo Ohgaki · commit 16411586449c · 2013-08-21T08:11:59.000+09:00
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
@@ -338,13 +338,13 @@ PS_READ_FUNC(files)
 		if (!PS(id)) {
 			return FAILURE;
 		}
-		php_session_reset_id(TSRMLS_C);
 		if (PS(use_cookies)) {
 			PS(send_cookie) = 1;
 		}
+		php_session_reset_id(TSRMLS_C);
 	}
 
-	ps_files_open(data, key TSRMLS_CC);
+	ps_files_open(data, PS(id) TSRMLS_CC);
 	if (data->fd < 0) {
 		return FAILURE;
 	}
diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
@@ -367,13 +367,13 @@ PS_READ_FUNC(mm)
 		if (!PS(id)) {
 			return FAILURE;
 		}
-		php_session_reset_id(TSRMLS_C);
 		if (PS(use_cookies)) {
 			PS(send_cookie) = 1;
 		}
+		php_session_reset_id(TSRMLS_C);
 	}
 
-	sd = ps_sd_lookup(data, key, 0);
+	sd = ps_sd_lookup(data, PS(id), 0);
 	if (sd) {
 		*vallen = sd->datalen;
 		*val = emalloc(sd->datalen + 1);
diff --git a/ext/session/tests/bug65475.phpt b/ext/session/tests/bug65475.phpt
@@ -0,0 +1,34 @@
+--TEST--
+Bug #65475: Session ID is not initialized when session.usr_strict_mode=1
+--INI--
+session.save_handler=files
+session.name=PHPSESSID
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+ob_start();
+
+echo "Testing file module".PHP_EOL;
+session_start();
+$_SESSION['foo'] = 1234;
+$_SESSION['cnt'] = 1;
+$session_id = session_id();
+session_write_close();
+
+session_start();
+var_dump($session_id === session_id());
+$_SESSION['cnt']++;
+session_write_close();
+
+session_start();
+var_dump($session_id === session_id());
+var_dump($_SESSION['cnt']); // Should be int(2)
+session_write_close();
+
+--EXPECTF--
+Testing file module
+bool(true)
+bool(true)
+int(2)
+
diff --git a/ext/session/tests/rfc1867.phpt b/ext/session/tests/rfc1867.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=0
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/rfc1867_cleanup.phpt b/ext/session/tests/rfc1867_cleanup.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=0
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/rfc1867_disabled.phpt b/ext/session/tests/rfc1867_disabled.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=0
 session.upload_progress.enabled=0
diff --git a/ext/session/tests/rfc1867_disabled_2.phpt b/ext/session/tests/rfc1867_disabled_2.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=0
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/rfc1867_inter.phpt b/ext/session/tests/rfc1867_inter.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=0
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/rfc1867_no_name.phpt b/ext/session/tests/rfc1867_no_name.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=0
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/rfc1867_sid_cookie.phpt b/ext/session/tests/rfc1867_sid_cookie.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=0
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/rfc1867_sid_get.phpt b/ext/session/tests/rfc1867_sid_get.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=0
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/rfc1867_sid_get_2.phpt b/ext/session/tests/rfc1867_sid_get_2.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=0
 session.use_only_cookies=0
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/rfc1867_sid_only_cookie.phpt b/ext/session/tests/rfc1867_sid_only_cookie.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=1
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/rfc1867_sid_post.phpt b/ext/session/tests/rfc1867_sid_post.phpt
@@ -7,6 +7,7 @@ comment=debug builds show some additional E_NOTICE errors
 upload_max_filesize=1024
 session.save_path=
 session.name=PHPSESSID
+session.use_strict_mode=0
 session.use_cookies=1
 session.use_only_cookies=0
 session.upload_progress.enabled=1
diff --git a/ext/session/tests/session_id_basic.phpt b/ext/session/tests/session_id_basic.phpt
@@ -20,6 +20,8 @@ var_dump(session_id("test"));
 var_dump(session_id());
 var_dump(session_id("1234567890"));
 var_dump(session_id());
+// Turn off strice mode, since it does not allow uninitialized session ID
+ini_set('session.use_strict_mode',false);
 var_dump(session_start());
 var_dump(session_id());
 var_dump(session_destroy());

Original file line number	Diff line number	Diff line change
`@@ -338,13 +338,13 @@ PS_READ_FUNC(files)`
`338`	`338`	`if (!PS(id)) {`
`339`	`339`	`return FAILURE;`
`340`	`340`	`}`
`341`		`- php_session_reset_id(TSRMLS_C);`
`342`	`341`	`if (PS(use_cookies)) {`
`343`	`342`	`PS(send_cookie) = 1;`
`344`	`343`	`}`
	`344`	`+ php_session_reset_id(TSRMLS_C);`
`345`	`345`	`}`
`346`	`346`
`347`		`- ps_files_open(data, key TSRMLS_CC);`
	`347`	`+ ps_files_open(data, PS(id) TSRMLS_CC);`
`348`	`348`	`if (data->fd < 0) {`
`349`	`349`	`return FAILURE;`
`350`	`350`	`}`
Original file line number	Diff line number	Diff line change
`@@ -367,13 +367,13 @@ PS_READ_FUNC(mm)`
`367`	`367`	`if (!PS(id)) {`
`368`	`368`	`return FAILURE;`
`369`	`369`	`}`
`370`		`- php_session_reset_id(TSRMLS_C);`
`371`	`370`	`if (PS(use_cookies)) {`
`372`	`371`	`PS(send_cookie) = 1;`
`373`	`372`	`}`
	`373`	`+ php_session_reset_id(TSRMLS_C);`
`374`	`374`	`}`
`375`	`375`
`376`		`- sd = ps_sd_lookup(data, key, 0);`
	`376`	`+ sd = ps_sd_lookup(data, PS(id), 0);`
`377`	`377`	`if (sd) {`
`378`	`378`	`*vallen = sd->datalen;`
`379`	`379`	`*val = emalloc(sd->datalen + 1);`