Removed the session 4.2 bug compatibility mode

10 files changed, 2 insertions, 69 deletions

diff --git a/NEWS b/NEWS
index 7499696f5c..14d9dcde44 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,8 @@
   . import_request_variables().
   . register_globals.
   . register_long_arrays ini option.
+  . Session bug compatibility mode (session.bug_compat42 and 
+    session.bug_compat_warn ini options).
   . session_is_registered(), session_register() and session_unregister() 
     functions.
   . y2k_compliance ini option.
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index 4c5515da03..8d3c9d0b4e 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -127,8 +127,6 @@ typedef struct _php_ps_globals {
 			zval *ps_gc;
 		} name;
 	} mod_user_names;
-	zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
-	zend_bool bug_compat_warn; /* Whether to warn about it */
 	const struct ps_serializer_struct *serializer;
 	zval *http_session_vars;
 	zend_bool auto_start;
diff --git a/ext/session/session.c b/ext/session/session.c
index aa81790951..f80efdae36 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -439,63 +439,11 @@ new_session:
 }
 /* }}} */
 
-static int migrate_global(HashTable *ht, HashPosition *pos TSRMLS_DC) /* {{{ */
-{
-	char *str;
-	uint str_len;
-	ulong num_key;
-	int n;
-	zval **val;
-	int ret = 0;
-
-	n = zend_hash_get_current_key_ex(ht, &str, &str_len, &num_key, 0, pos);
-
-	switch (n) {
-		case HASH_KEY_IS_STRING:
-			if (zend_hash_find(&EG(symbol_table), str, str_len, (void **) &val) == SUCCESS &&
-				val && Z_TYPE_PP(val) != IS_NULL
-			) {
-				ZEND_SET_SYMBOL_WITH_LENGTH(ht, str, str_len, *val, Z_REFCOUNT_PP(val) + 1, 1);
-				ret = 1;
-			}
-			break;
-		case HASH_KEY_IS_LONG:
-			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The session bug compatibility code will not "
-					"try to locate the global variable $%lu due to its "
-					"numeric nature", num_key);
-			break;
-	}
-	return ret;
-}
-/* }}} */
-
 static void php_session_save_current_state(TSRMLS_D) /* {{{ */
 {
 	int ret = FAILURE;
 
 	IF_SESSION_VARS() {
-		if (PS(bug_compat)) {
-			HashTable *ht = Z_ARRVAL_P(PS(http_session_vars));
-			HashPosition pos;
-			zval **val;
-			int do_warn = 0;
-
-			zend_hash_internal_pointer_reset_ex(ht, &pos);
-
-			while (zend_hash_get_current_data_ex(ht, (void **) &val, &pos) != FAILURE) {
-				if (Z_TYPE_PP(val) == IS_NULL) {
-					if (migrate_global(ht, &pos TSRMLS_CC)) {
-						do_warn = 1;
-					}
-				}
-				zend_hash_move_forward_ex(ht, &pos);
-			}
-
-			if (do_warn && PS(bug_compat_warn)) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Your script possibly relies on a session side-effect which existed until PHP 4.2.3. Please be advised that the session extension does not consider global variables as a source of data. You can disable this functionality and this warning by setting session.bug_compat_42 or session.bug_compat_warn to off, respectively");
-			}
-		}
-
 		if (PS(mod_data)) {
 			char *val;
 			int vallen;
@@ -684,8 +632,6 @@ static PHP_INI_MH(OnUpdateHashFunc) /* {{{ */
 /* {{{ PHP_INI
  */
 PHP_INI_BEGIN()
-	STD_PHP_INI_BOOLEAN("session.bug_compat_42",    "1",         PHP_INI_ALL, OnUpdateBool,   bug_compat,         php_ps_globals,    ps_globals)
-	STD_PHP_INI_BOOLEAN("session.bug_compat_warn",  "1",         PHP_INI_ALL, OnUpdateBool,   bug_compat_warn,    php_ps_globals,    ps_globals)
 	STD_PHP_INI_ENTRY("session.save_path",          "",          PHP_INI_ALL, OnUpdateSaveDir,save_path,          php_ps_globals,    ps_globals)
 	STD_PHP_INI_ENTRY("session.name",               "PHPSESSID", PHP_INI_ALL, OnUpdateString, session_name,       php_ps_globals,    ps_globals)
 	PHP_INI_ENTRY("session.save_handler",           "files",     PHP_INI_ALL, OnUpdateSaveHandler)
diff --git a/ext/session/tests/007.phpt b/ext/session/tests/007.phpt
index d17a1ff16e..ad1ec3507a 100644
--- a/ext/session/tests/007.phpt
+++ b/ext/session/tests/007.phpt
@@ -5,7 +5,6 @@ bug compatibility: unset($c) with enabled register_globals
 --INI--
 session.use_cookies=0
 session.cache_limiter=
-session.bug_compat_42=1
 session.serialize_handler=php
 session.save_handler=files
 precision=14
diff --git a/ext/session/tests/009.phpt b/ext/session/tests/009.phpt
index 02e6eb17b2..d73bc238c9 100644
--- a/ext/session/tests/009.phpt
+++ b/ext/session/tests/009.phpt
@@ -5,8 +5,6 @@ unset($_SESSION["name"]); test
 --INI--
 session.use_cookies=0
 session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
 session.serialize_handler=php
 session.save_handler=files
 --FILE--
diff --git a/ext/session/tests/010.phpt b/ext/session/tests/010.phpt
index 9ece4e187b..79638d283d 100644
--- a/ext/session/tests/010.phpt
+++ b/ext/session/tests/010.phpt
@@ -5,8 +5,6 @@ $session_array = explode(";", session_encode()); should not segfault
 --INI--
 session.use_cookies=0
 session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
 --FILE--
 <?php
 error_reporting(E_ALL);
diff --git a/ext/session/tests/011.phpt b/ext/session/tests/011.phpt
index 809ee3fd3d..ff1adbaec8 100644
--- a/ext/session/tests/011.phpt
+++ b/ext/session/tests/011.phpt
@@ -5,8 +5,6 @@ session_decode(); should not segfault
 --INI--
 session.use_cookies=0
 session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
 --FILE--
 <?php
 error_reporting(E_ALL);
diff --git a/ext/session/tests/012.phpt b/ext/session/tests/012.phpt
index 4746b85be0..8708011273 100644
--- a/ext/session/tests/012.phpt
+++ b/ext/session/tests/012.phpt
@@ -5,8 +5,6 @@ registering $_SESSION should not segfault
 --INI--
 session.use_cookies=0
 session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
 session.serialize_handler=php
 session.save_handler=files
 --FILE--
diff --git a/ext/session/tests/013.phpt b/ext/session/tests/013.phpt
index e67a115604..8d0f284b17 100644
--- a/ext/session/tests/013.phpt
+++ b/ext/session/tests/013.phpt
@@ -5,8 +5,6 @@ redefining SID should not cause warnings
 --INI--
 session.use_cookies=0
 session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
 session.serialize_handler=php
 session.save_handler=files
 --FILE--
diff --git a/ext/session/tests/014.phpt b/ext/session/tests/014.phpt
index 0c32dce510..73bc28ea66 100644
--- a/ext/session/tests/014.phpt
+++ b/ext/session/tests/014.phpt
@@ -6,8 +6,6 @@ a script should not be able to modify session.use_trans_sid
 session.use_trans_sid=0
 session.use_cookies=0
 session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
 session.name=PHPSESSID
 session.serialize_handler=php
 session.save_handler=files