Fixed for PHP 5.2 and ZTS environment

hnw · Sep 12, 2012 · fb18236 · fb18236
1 parent 7d494f5
commit fb18236
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/php_timecop.h b/php_timecop.h
@@ -39,6 +39,16 @@ extern zend_module_entry timecop_module_entry;
 #include <time.h>
 #include "Zend/zend_interfaces.h"
 
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)                          (++(pz)->refcount)
+#define Z_DELREF_P(pz)                          (--(pz)->refcount)
+#define Z_REFCOUNT_P(pz)                        ((pz)->refcount)
+#define Z_SET_REFCOUNT_P(pz, rc)        ((pz)->refcount = rc)
+#define Z_REFCOUNT_PP(ppz)                      Z_REFCOUNT_P(*(ppz))
+#define Z_DELREF_PP(ppz)                        Z_DELREF_P(*(ppz))
+#endif
+
 PHP_MINIT_FUNCTION(timecop);
 PHP_MSHUTDOWN_FUNCTION(timecop);
 PHP_RINIT_FUNCTION(timecop);

diff --git a/tests/006.phpt b/tests/006.phpt
@@ -3,7 +3,7 @@ Check for timecop.sync_request_time=1 and $_SERVER['REQUEST_TIME']
 --SKIPIF--
 <?php
 	extension_loaded('timecop') or die('skip timecop not available');
-	$required_func = array("timecop_freeze", "timecop_return");
+	$required_func = array("timecop_freeze", "timecop_travel", "timecop_return");
 	foreach ($required_func as $func_name) {
 		if (!function_exists($func_name)) {
 			die("skip $func_name() function is not available.");
@@ -14,10 +14,13 @@ Check for timecop.sync_request_time=1 and $_SERVER['REQUEST_TIME']
 --FILE--
 <?php
 $orig_request_time = $_SERVER['REQUEST_TIME'];
-timecop_freeze(12345);
+timecop_freeze(1234);
+var_dump($_SERVER['REQUEST_TIME']);
+timecop_travel(12345);
 var_dump($_SERVER['REQUEST_TIME']);
 timecop_return();
 var_dump($orig_request_time === $_SERVER['REQUEST_TIME']);
 --EXPECT--
+int(1234)
 int(12345)
 bool(true)
diff --git a/tests/007.phpt b/tests/007.phpt
@@ -3,7 +3,7 @@ Check for timecop.sync_request_time=0 and $_SERVER['REQUEST_TIME']
 --SKIPIF--
 <?php
 	extension_loaded('timecop') or die('skip timecop not available');
-	$required_func = array("timecop_freeze", "timecop_return");
+	$required_func = array("timecop_freeze", "timecop_travel", "timecop_return");
 	foreach ($required_func as $func_name) {
 		if (!function_exists($func_name)) {
 			die("skip $func_name() function is not available.");
@@ -15,10 +15,13 @@ timecop.sync_request_time=0
 --FILE--
 <?php
 $orig_request_time = $_SERVER['REQUEST_TIME'];
-timecop_freeze(12345);
+timecop_freeze(1234);
+var_dump($orig_request_time === $_SERVER['REQUEST_TIME']);
+timecop_travel(12345);
 var_dump($orig_request_time === $_SERVER['REQUEST_TIME']);
 timecop_return();
 var_dump($orig_request_time === $_SERVER['REQUEST_TIME']);
 --EXPECT--
 bool(true)
 bool(true)
+bool(true)
diff --git a/timecop.c b/timecop.c
@@ -461,7 +461,7 @@ static int update_request_time(long unixtime TSRMLS_DC)
 		if (TIMECOP_G(orig_request_time) == NULL) {
 			TIMECOP_G(orig_request_time) = *request_time;
 		} else {
-			Z_DELREF(**request_time);
+			Z_DELREF_PP(request_time);
 		}
 		MAKE_STD_ZVAL(*request_time);
 		ZVAL_LONG(*request_time, unixtime);
@@ -479,7 +479,7 @@ static int restore_request_time(TSRMLS_D)
 		zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS &&
 		Z_TYPE_PP(server_vars) == IS_ARRAY &&
 		zend_hash_find(Z_ARRVAL_PP(server_vars), "REQUEST_TIME", sizeof("REQUEST_TIME"), (void **) &request_time) == SUCCESS) {
-		Z_DELREF(**request_time);
+		Z_DELREF_PP(request_time);
 		*request_time = TIMECOP_G(orig_request_time);
 		TIMECOP_G(orig_request_time) = NULL;
 	}
@@ -590,7 +590,7 @@ PHP_FUNCTION(timecop_freeze)
 	TIMECOP_G(freezed_timestamp) = timestamp;
 
 	if (TIMECOP_G(sync_request_time)){
-		update_request_time(timestamp);
+		update_request_time(timestamp TSRMLS_CC);
 	}
 
 	RETURN_TRUE;
@@ -609,7 +609,7 @@ PHP_FUNCTION(timecop_travel)
 	TIMECOP_G(travel_offset) = timestamp - time(NULL);
 
 	if (TIMECOP_G(sync_request_time)){
-		update_request_time(timestamp);
+		update_request_time(timestamp TSRMLS_CC);
 	}
 
 	RETURN_TRUE;
@@ -623,7 +623,7 @@ PHP_FUNCTION(timecop_return)
 	TIMECOP_G(timecop_mode) = TIMECOP_MODE_NORMAL;
 
 	if (TIMECOP_G(sync_request_time)){
-		restore_request_time();
+		restore_request_time(TSRMLS_C);
 	}
 
 	RETURN_TRUE;