Index: ext/date/php_date.c
===================================================================
--- ext/date/php_date.c	(revision 291371)
+++ ext/date/php_date.c	(working copy)
@@ -332,13 +332,13 @@
 	PHP_MINIT(date),            /* process startup */
 	PHP_MSHUTDOWN(date),        /* process shutdown */
 	PHP_RINIT(date),            /* request startup */
-	PHP_RSHUTDOWN(date),        /* request shutdown */
+	NULL,                       /* request shutdown */
 	PHP_MINFO(date),            /* extension info */
 	PHP_VERSION,                /* extension version */
 	PHP_MODULE_GLOBALS(date),   /* globals descriptor */
 	PHP_GINIT(date),            /* globals ctor */
 	NULL,                       /* globals dtor */
-	NULL,                       /* post deactivate */
+	ZEND_MODULE_POST_ZEND_DEACTIVATE_N(date), /* post request shutdown (deactivate) */
 	STANDARD_MODULE_PROPERTIES_EX
 };
 /* }}} */
@@ -374,18 +374,19 @@
 }
 /* }}} */
 
-/* {{{ PHP_RSHUTDOWN_FUNCTION */
-PHP_RSHUTDOWN_FUNCTION(date)
+/* {{{ ZEND_MODULE_POST_ZEND_DEACTIVATE_D */
+ZEND_MODULE_POST_ZEND_DEACTIVATE_D(date)
 {
 	if (DATEG(timezone)) {
 		efree(DATEG(timezone));
 	}
 	DATEG(timezone) = NULL;
-	if(DATEG(tzcache)) {
+
+	if (DATEG(tzcache)) {
 		zend_hash_destroy(DATEG(tzcache));
 		FREE_HASHTABLE(DATEG(tzcache));
-		DATEG(tzcache) = NULL;
 	}
+	DATEG(tzcache) = NULL;
 
 	return SUCCESS;
 }
Index: ext/date/php_date.h
===================================================================
--- ext/date/php_date.h	(revision 291366)
+++ ext/date/php_date.h	(working copy)
@@ -79,7 +79,7 @@
 PHP_FUNCTION(date_sun_info);
 
 PHP_RINIT_FUNCTION(date);
-PHP_RSHUTDOWN_FUNCTION(date);
+ZEND_MODULE_POST_ZEND_DEACTIVATE_D(date);
 PHP_MINIT_FUNCTION(date);
 PHP_MSHUTDOWN_FUNCTION(date);
 PHP_MINFO_FUNCTION(date);