com php-src: Fixed ZTS and added fix to NEWS.: NEWS ext/date/php_date.c
| From: | Derick Rethans | Date: | Tue, 11 Feb 2014 11:27:01 +0000 |
| Subject: | com php-src: Fixed ZTS and added fix to NEWS.: NEWS ext/date/php_date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75956@lists.php.net to get a copy of this message | ||
Commit: 39e721cf50276e5872e445b36fefdc4eb80cdcf7
Author: Derick Rethans <github@derickrethans.nl> Tue, 11 Feb 2014 11:27:01 +0000
Parents: 179e45920cbedc3bee1a8c46457cb42b2926e5e4
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=39e721cf50276e5872e445b36fefdc4eb80cdcf7
Log:
Fixed ZTS and added fix to NEWS.
Changed paths:
M NEWS
M ext/date/php_date.c
Diff:
diff --git a/NEWS b/NEWS
index 04bb71c..c657efc 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ PHP NEWS
- Core:
. Fixed Request #66574i (Allow multiple paths in php_ini_scanned_path). (Remi)
+- Date:
+ . Fixed bug #45528 (Allow the DateTimeZone constructor to accept timezones
+ per offset too). (Derick)
+
- LDAP:
. Implemented ldap_modify_batch (https://wiki.php.net/rfc/ldap_modify_batch).
(Ondřej Hošek)
diff --git a/ext/date/php_date.c b/ext/date/php_date..c
index a61d9db..f6b12bc 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -3638,7 +3638,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz
TSRML
efree(dummy_t);
return FAILURE;
} else {
- set_timezone_from_timelib_time(tzobj, dummy_t TSRMLS_CC);
+ set_timezone_from_timelib_time(tzobj, dummy_t);
efree(dummy_t);
return SUCCESS;
}