[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 config.w32
kalle Sun May 31 11:16:46 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3config.w32
Log:
This shouldn't have been in there
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.1.2.4
php-src/ext/sqlite3/config.w32:1.1.2.5
--- php-src/ext/sqlite3/config.w32:1.1.2.4 Fri May 22 19:47:15 2009
+++ php-src/ext/sqlite3/config.w32 Sun May 31 11:16:46 2009
@@ -1,10 +1,9 @@
-// $Id: config.w32,v 1.1.2.4 2009/05/22 19:47:15 kalle Exp $
+// $Id: config.w32,v 1.1.2.5 2009/05/31 11:16:46 kalle Exp $
// vim:ft=javascript
ARG_WITH(sqlite3, SQLite 3 support, no);
if (PHP_SQLITE3 != no) {
-WARNING(PHP_ZTS);
ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS == yes
? 1 : 0) + /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
EXTENSION(sqlite3, sqlite3.c, null, /I + configure_module_dirname
+ /libsqlite /I + configure_module_dirname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
janiSun May 31 13:20:22 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: fix news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.612r2=1.2027.2.547.2.965.2.613diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.612 php-src/NEWS:1.2027.2.547.2.965.2.613 --- php-src/NEWS:1.2027.2.547.2.965.2.612 Fri May 29 13:11:10 2009 +++ php-src/NEWSSun May 31 13:20:22 2009 @@ -10,6 +10,8 @@ - Changed SQLite3::loadExtension() to be disabled for threaded SAPIs. (Scott) - Added the ability for json_decode() to take a user specified depth. (Scott) +- Added support for the mysql_stmt_next_result() function from libmysql. + (Andrey) - Fixed bug #48257 (PharData throws exception with non-phar tar). (Greg) - Fixed bug #48227 (NumberFormatter::format leaks memory). (Felipe) @@ -21,9 +23,6 @@ (patch by datib...@php.net) - Fixed potential segfault with converting phars containing metadata to other formats (Greg). -- Added support for the mysql_stmt_next_result() function from libmysql. - mysqlnd already supports this and the mysqli function was already there. - (Andrey) 07 May 2009, PHP 5.3.0 RC 2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json json.c
janiSun May 31 13:50:50 2009 UTC
Modified files:
/php-src/ext/json json.c
Log:
- No dots in error messages
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.54r2=1.55diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.54 php-src/ext/json/json.c:1.55
--- php-src/ext/json/json.c:1.54Sun May 31 01:45:05 2009
+++ php-src/ext/json/json.c Sun May 31 13:50:50 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.54 2009/05/31 01:45:05 andrei Exp $ */
+/* $Id: json.c,v 1.55 2009/05/31 13:50:50 jani Exp $ */
/*
* UTODO
@@ -456,7 +456,7 @@
smart_str_appendl(buf, d, len);
efree(d);
} else {
- zend_error(E_WARNING, [json]
(json_encode_r) double %.9g does not conform to the JSON spec, encoded as 0.,
dbl);
+ zend_error(E_WARNING, [json]
(json_encode_r) double %.9g does not conform to the JSON spec, encoded as 0,
dbl);
smart_str_appendc(buf, '0');
}
}
@@ -473,7 +473,7 @@
break;
default:
- zend_error(E_WARNING, [json] (json_encode_r) type is
unsupported, encoded as null.);
+ zend_error(E_WARNING, [json] (json_encode_r) type is
unsupported, encoded as null);
smart_str_appendl(buf, null, 4);
break;
}
@@ -543,7 +543,7 @@
}
if (depth = 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Depth must greater
than zero.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Depth must greater
than zero);
RETURN_NULL();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json json.c
janiSun May 31 13:51:08 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/json json.c
Log:
MFH: no dots in errors
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.22r2=1.9.2.19.2.23diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.19.2.22
php-src/ext/json/json.c:1.9.2.19.2.23
--- php-src/ext/json/json.c:1.9.2.19.2.22 Sun May 31 01:44:07 2009
+++ php-src/ext/json/json.c Sun May 31 13:51:08 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.9.2.19.2.22 2009/05/31 01:44:07 andrei Exp $ */
+/* $Id: json.c,v 1.9.2.19.2.23 2009/05/31 13:51:08 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -442,7 +442,7 @@
smart_str_appendl(buf, d, len);
efree(d);
} else {
- zend_error(E_WARNING, [json]
(php_json_encode) double %.9g does not conform to the JSON spec, encoded as
0., dbl);
+ zend_error(E_WARNING, [json]
(php_json_encode) double %.9g does not conform to the JSON spec, encoded as 0,
dbl);
smart_str_appendc(buf, '0');
}
}
@@ -458,7 +458,7 @@
break;
default:
- zend_error(E_WARNING, [json] (php_json_encode) type is
unsupported, encoded as null.);
+ zend_error(E_WARNING, [json] (php_json_encode) type is
unsupported, encoded as null);
smart_str_appendl(buf, null, 4);
break;
}
@@ -485,7 +485,7 @@
}
if (depth = 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Depth must greater
than zero.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Depth must greater
than zero);
RETURN_NULL();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json json.c
janiSun May 31 13:51:23 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json json.c
Log:
MFH: no dots in errors
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.27r2=1.9.2.28diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.27 php-src/ext/json/json.c:1.9.2.28
--- php-src/ext/json/json.c:1.9.2.27Sun May 31 01:43:45 2009
+++ php-src/ext/json/json.c Sun May 31 13:51:23 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.9.2.27 2009/05/31 01:43:45 andrei Exp $ */
+/* $Id: json.c,v 1.9.2.28 2009/05/31 13:51:23 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -371,7 +371,7 @@
smart_str_appendl(buf, d, len);
efree(d);
} else {
-zend_error(E_WARNING, [json] (php_json_encode) double
%.9g does not conform to the JSON spec, encoded as 0., dbl);
+zend_error(E_WARNING, [json] (php_json_encode) double
%.9g does not conform to the JSON spec, encoded as 0, dbl);
smart_str_appendc(buf, '0');
}
}
@@ -384,7 +384,7 @@
json_encode_array(buf, val TSRMLS_CC);
break;
default:
-zend_error(E_WARNING, [json] (php_json_encode) type is
unsupported, encoded as null.);
+zend_error(E_WARNING, [json] (php_json_encode) type is
unsupported, encoded as null);
smart_str_appendl(buf, null, 4);
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/snmp snmp.c
iliaa Sun May 31 14:11:04 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/snmp snmp.c
Log:
Fixed bug #48359 (Script hangs on snmprealwalk if OID is not increasing)
# Original patch by simonov at gmail dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.5.2.11r2=1.106.2.2.2.5.2.12diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.11
php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.12
--- php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.11 Sat May 2 21:13:54 2009
+++ php-src/ext/snmp/snmp.c Sun May 31 14:11:04 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: snmp.c,v 1.106.2.2.2.5.2.11 2009/05/02 21:13:54 jani Exp $ */
+/* $Id: snmp.c,v 1.106.2.2.2.5.2.12 2009/05/31 14:11:04 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -677,9 +677,14 @@
if (st = SNMP_CMD_WALK st !=
SNMP_CMD_SET) {
if (vars-type !=
SNMP_ENDOFMIBVIEW
vars-type !=
SNMP_NOSUCHOBJECT vars-type != SNMP_NOSUCHINSTANCE) {
- memmove((char *)name,
(char *)vars-name,vars-name_length * sizeof(oid));
- name_length =
vars-name_length;
- keepwalking = 1;
+ if
(snmp_oid_compare(name, name_length, vars-name, vars-name_length) = 0) {
+
php_error_docref(NULL TSRMLS_CC, E_WARNING, Error: OID not increasing:
%s,name);
+ keepwalking = 0;
+ } else {
+ memmove((char
*)name, (char *)vars-name,vars-name_length * sizeof(oid));
+ name_length =
vars-name_length;
+ keepwalking = 1;
+ }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/snmp snmp.c
iliaa Sun May 31 14:11:14 2009 UTC
Modified files:
/php-src/ext/snmp snmp.c
Log:
MFB: Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
increasing)
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.125r2=1.126diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.125 php-src/ext/snmp/snmp.c:1.126
--- php-src/ext/snmp/snmp.c:1.125 Sat May 2 21:13:39 2009
+++ php-src/ext/snmp/snmp.c Sun May 31 14:11:14 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: snmp.c,v 1.125 2009/05/02 21:13:39 jani Exp $ */
+/* $Id: snmp.c,v 1.126 2009/05/31 14:11:14 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -677,9 +677,14 @@
if (st = SNMP_CMD_WALK st !=
SNMP_CMD_SET) {
if (vars-type !=
SNMP_ENDOFMIBVIEW
vars-type !=
SNMP_NOSUCHOBJECT vars-type != SNMP_NOSUCHINSTANCE) {
- memmove((char *)name,
(char *)vars-name,vars-name_length * sizeof(oid));
- name_length =
vars-name_length;
- keepwalking = 1;
+ if
(snmp_oid_compare(name, name_length, vars-name, vars-name_length) = 0) {
+
php_error_docref(NULL TSRMLS_CC, E_WARNING, Error: OID not increasing:
%s,name);
+ keepwalking = 0;
+ } else {
+ memmove((char
*)name, (char *)vars-name,vars-name_length * sizeof(oid));
+ name_length =
vars-name_length;
+ keepwalking = 1;
+ }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/snmp snmp.c
iliaa Sun May 31 14:14:08 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/snmp snmp.c
/php-srcNEWS
Log:
MFB: Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
increasing)
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.8r2=1.106.2.2.2.9diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.8
php-src/ext/snmp/snmp.c:1.106.2.2.2.9
--- php-src/ext/snmp/snmp.c:1.106.2.2.2.8 Wed Dec 31 11:17:43 2008
+++ php-src/ext/snmp/snmp.c Sun May 31 14:14:07 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: snmp.c,v 1.106.2.2.2.8 2008/12/31 11:17:43 sebastian Exp $ */
+/* $Id: snmp.c,v 1.106.2.2.2.9 2009/05/31 14:14:07 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -490,9 +490,14 @@
if (st = SNMP_CMD_WALK st !=
SNMP_CMD_SET) {
if (vars-type !=
SNMP_ENDOFMIBVIEW
vars-type !=
SNMP_NOSUCHOBJECT vars-type != SNMP_NOSUCHINSTANCE) {
- memmove((char *)name,
(char *)vars-name,vars-name_length * sizeof(oid));
- name_length =
vars-name_length;
- keepwalking = 1;
+ if
(snmp_oid_compare(name, name_length, vars-name, vars-name_length) = 0) {
+
php_error_docref(NULL TSRMLS_CC, E_WARNING, Error: OID not increasing:
%s,name);
+ keepwalking = 0;
+ } else {
+ memmove((char
*)name, (char *)vars-name,vars-name_length * sizeof(oid));
+ name_length =
vars-name_length;
+ keepwalking = 1;
+ }
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1534r2=1.2027.2.547.2.1535diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1534 php-src/NEWS:1.2027.2.547.2.1535
--- php-src/NEWS:1.2027.2.547.2.1534Sat May 30 16:42:50 2009
+++ php-src/NEWSSun May 31 14:14:07 2009
@@ -10,9 +10,12 @@
arguments). (Arnaud)
- Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg
files). (Pierre)
+- Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
+ increasing). (Ilia, simonov at gmail dot com)
- Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
(Kanwaljeet Singla, Venkat Raman Don)
+
27 May 2009, PHP 5.2.10RC1
- Updated timezone database to version 2009.8 (2009h) (Derick)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json php_json.h
andrei Sun May 31 18:55:10 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/json php_json.h Log: Fix the build. http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.8.2.2.2.6r2=1.8.2.2.2.7diff_format=u Index: php-src/ext/json/php_json.h diff -u php-src/ext/json/php_json.h:1.8.2.2.2.6 php-src/ext/json/php_json.h:1.8.2.2.2.7 --- php-src/ext/json/php_json.h:1.8.2.2.2.6 Sun May 31 01:44:07 2009 +++ php-src/ext/json/php_json.h Sun May 31 18:55:10 2009 @@ -16,12 +16,13 @@ +--+ */ -/* $Id: php_json.h,v 1.8.2.2.2.6 2009/05/31 01:44:07 andrei Exp $ */ +/* $Id: php_json.h,v 1.8.2.2.2.7 2009/05/31 18:55:10 andrei Exp $ */ #ifndef PHP_JSON_H #define PHP_JSON_H #define PHP_JSON_VERSION 1.2.1 +#include ext/standard/php_smart_str.h extern zend_module_entry json_module_entry; #define phpext_json_ptr json_module_entry -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json php_json.h
andrei Sun May 31 18:55:36 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/json php_json.h Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.8.2.5r2=1.8.2.6diff_format=u Index: php-src/ext/json/php_json.h diff -u php-src/ext/json/php_json.h:1.8.2.5 php-src/ext/json/php_json.h:1.8.2.6 --- php-src/ext/json/php_json.h:1.8.2.5 Sun May 31 01:43:45 2009 +++ php-src/ext/json/php_json.h Sun May 31 18:55:36 2009 @@ -16,13 +16,15 @@ +--+ */ -/* $Id: php_json.h,v 1.8.2.5 2009/05/31 01:43:45 andrei Exp $ */ +/* $Id: php_json.h,v 1.8.2.6 2009/05/31 18:55:36 andrei Exp $ */ #ifndef PHP_JSON_H #define PHP_JSON_H #define PHP_JSON_VERSION 1.2.1 +#include ext/standard/php_smart_str.h + extern zend_module_entry json_module_entry; #define phpext_json_ptr json_module_entry -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date php_date.c php_date.h
stasSun May 31 20:43:57 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date php_date.c php_date.h
Log:
fix for #48247
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.69r2=1.43.2.45.2.70diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.69
php-src/ext/date/php_date.c:1.43.2.45.2.70
--- php-src/ext/date/php_date.c:1.43.2.45.2.69 Tue May 19 15:37:38 2009
+++ php-src/ext/date/php_date.c Sun May 31 20:43:57 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.69 2009/05/19 15:37:38 jani Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.70 2009/05/31 20:43:57 stas Exp $ */
#include php.h
#include php_streams.h
@@ -343,6 +343,7 @@
{
date_globals-default_timezone = NULL;
date_globals-timezone = NULL;
+ date_globals-tzcache = NULL;
}
/* }}} */
@@ -361,7 +362,7 @@
efree(DATEG(timezone));
}
DATEG(timezone) = NULL;
- zend_hash_init(DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor, 0);
+ DATEG(tzcache) = NULL;
return SUCCESS;
}
@@ -374,8 +375,11 @@
efree(DATEG(timezone));
}
DATEG(timezone) = NULL;
- zend_hash_destroy(DATEG(tzcache));
-
+ if(DATEG(tzcache)) {
+ zend_hash_destroy(DATEG(tzcache));
+ FREE_HASHTABLE(DATEG(tzcache));
+ DATEG(tzcache) = NULL;
+ }
return SUCCESS;
}
/* }}} */
@@ -552,13 +556,18 @@
{
timelib_tzinfo *tzi, **ptzi;
- if (zend_hash_find(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void **) ptzi) == SUCCESS) {
+ if(!DATEG(tzcache)) {
+ ALLOC_HASHTABLE(DATEG(tzcache));
+ zend_hash_init(DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor,
0);
+ }
+
+ if (zend_hash_find(DATEG(tzcache), formal_tzname, strlen(formal_tzname)
+ 1, (void **) ptzi) == SUCCESS) {
return *ptzi;
}
tzi = timelib_parse_tzfile(formal_tzname, tzdb);
if (tzi) {
- zend_hash_add(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void *) tzi, sizeof(timelib_tzinfo*), NULL);
+ zend_hash_add(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void *) tzi, sizeof(timelib_tzinfo*), NULL);
}
return tzi;
}
@@ -654,7 +663,7 @@
{
char *tz;
timelib_tzinfo *tzi;
-
+
tz = guess_timezone(DATE_TIMEZONEDB TSRMLS_CC);
tzi = php_date_parse_tzfile(tz, DATE_TIMEZONEDB TSRMLS_CC);
if (! tzi) {
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.h?r1=1.17.2.11.2.5r2=1.17.2.11.2.6diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.17.2.11.2.5
php-src/ext/date/php_date.h:1.17.2.11.2.6
--- php-src/ext/date/php_date.h:1.17.2.11.2.5 Wed Dec 31 11:17:36 2008
+++ php-src/ext/date/php_date.h Sun May 31 20:43:57 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.h,v 1.17.2.11.2.5 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: php_date.h,v 1.17.2.11.2.6 2009/05/31 20:43:57 stas Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -87,7 +87,7 @@
ZEND_BEGIN_MODULE_GLOBALS(date)
char *default_timezone;
char *timezone;
- HashTable tzcache;
+ HashTable *tzcache;
ZEND_END_MODULE_GLOBALS(date)
#ifdef ZTS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date php_date.c php_date.h
stasSun May 31 21:28:38 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date php_date.c php_date.h
Log:
fix for #48247
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.77r2=1.43.2.45.2.51.2.78diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.77
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.78
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.77 Tue May 19 19:23:33 2009
+++ php-src/ext/date/php_date.c Sun May 31 21:28:38 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.77 2009/05/19 19:23:33 bjori Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.78 2009/05/31 21:28:38 stas Exp $ */
#include php.h
#include php_streams.h
@@ -590,6 +590,7 @@
{
date_globals-default_timezone = NULL;
date_globals-timezone = NULL;
+ date_globals-tzcache = NULL;
}
/* }}} */
@@ -608,7 +609,7 @@
efree(DATEG(timezone));
}
DATEG(timezone) = NULL;
- zend_hash_init(DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor, 0);
+ DATEG(tzcache) = NULL;
return SUCCESS;
}
@@ -621,8 +622,11 @@
efree(DATEG(timezone));
}
DATEG(timezone) = NULL;
- zend_hash_destroy(DATEG(tzcache));
-
+ if(DATEG(tzcache)) {
+ zend_hash_destroy(DATEG(tzcache));
+ FREE_HASHTABLE(DATEG(tzcache));
+ DATEG(tzcache) = NULL;
+ }
return SUCCESS;
}
/* }}} */
@@ -804,13 +808,18 @@
{
timelib_tzinfo *tzi, **ptzi;
- if (zend_hash_find(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void **) ptzi) == SUCCESS) {
+ if(!DATEG(tzcache)) {
+ ALLOC_HASHTABLE(DATEG(tzcache));
+ zend_hash_init(DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor,
0);
+ }
+
+ if (zend_hash_find(DATEG(tzcache), formal_tzname, strlen(formal_tzname)
+ 1, (void **) ptzi) == SUCCESS) {
return *ptzi;
}
tzi = timelib_parse_tzfile(formal_tzname, tzdb);
if (tzi) {
- zend_hash_add(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void *) tzi, sizeof(timelib_tzinfo*), NULL);
+ zend_hash_add(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void *) tzi, sizeof(timelib_tzinfo*), NULL);
}
return tzi;
}
@@ -906,7 +915,7 @@
{
char *tz;
timelib_tzinfo *tzi;
-
+
tz = guess_timezone(DATE_TIMEZONEDB TSRMLS_CC);
tzi = php_date_parse_tzfile(tz, DATE_TIMEZONEDB TSRMLS_CC);
if (! tzi) {
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.h?r1=1.17.2.11.2.3.2.12r2=1.17.2.11.2.3.2.13diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.17.2.11.2.3.2.12
php-src/ext/date/php_date.h:1.17.2.11.2.3.2.13
--- php-src/ext/date/php_date.h:1.17.2.11.2.3.2.12 Sun May 3 19:58:49 2009
+++ php-src/ext/date/php_date.h Sun May 31 21:28:38 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.h,v 1.17.2.11.2.3.2.12 2009/05/03 19:58:49 derick Exp $ */
+/* $Id: php_date.h,v 1.17.2.11.2.3.2.13 2009/05/31 21:28:38 stas Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -149,7 +149,7 @@
ZEND_BEGIN_MODULE_GLOBALS(date)
char *default_timezone;
char *timezone;
- HashTable tzcache;
+ HashTable *tzcache;
timelib_error_container *last_errors;
ZEND_END_MODULE_GLOBALS(date)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c php_date.h
stasSun May 31 21:29:54 2009 UTC
Modified files:
/php-src/ext/date php_date.c php_date.h
Log:
fix for #48247
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.235r2=1.236diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.235 php-src/ext/date/php_date.c:1.236
--- php-src/ext/date/php_date.c:1.235 Wed May 20 08:18:07 2009
+++ php-src/ext/date/php_date.c Sun May 31 21:29:54 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.235 2009/05/20 08:18:07 kalle Exp $ */
+/* $Id: php_date.c,v 1.236 2009/05/31 21:29:54 stas Exp $ */
#include php.h
#include php_streams.h
@@ -597,6 +597,7 @@
{
date_globals-default_timezone = NULL;
date_globals-timezone = NULL;
+ date_globals-tzcache = NULL;
}
/* }}} */
@@ -615,7 +616,7 @@
efree(DATEG(timezone));
}
DATEG(timezone) = NULL;
- zend_hash_init(DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor, 0);
+ DATEG(tzcache) = NULL;
return SUCCESS;
}
@@ -628,8 +629,11 @@
efree(DATEG(timezone));
}
DATEG(timezone) = NULL;
- zend_hash_destroy(DATEG(tzcache));
-
+ if(DATEG(tzcache)) {
+ zend_hash_destroy(DATEG(tzcache));
+ FREE_HASHTABLE(DATEG(tzcache));
+ DATEG(tzcache) = NULL;
+ }
return SUCCESS;
}
/* }}} */
@@ -811,13 +815,18 @@
{
timelib_tzinfo *tzi, **ptzi;
- if (zend_hash_find(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void **) ptzi) == SUCCESS) {
+ if(!DATEG(tzcache)) {
+ ALLOC_HASHTABLE(DATEG(tzcache));
+ zend_hash_init(DATEG(tzcache), 4, NULL, _php_date_tzinfo_dtor,
0);
+ }
+
+ if (zend_hash_find(DATEG(tzcache), formal_tzname, strlen(formal_tzname)
+ 1, (void **) ptzi) == SUCCESS) {
return *ptzi;
}
tzi = timelib_parse_tzfile(formal_tzname, tzdb);
if (tzi) {
- zend_hash_add(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void *) tzi, sizeof(timelib_tzinfo*), NULL);
+ zend_hash_add(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void *) tzi, sizeof(timelib_tzinfo*), NULL);
}
return tzi;
}
@@ -906,7 +915,7 @@
{
char *tz;
timelib_tzinfo *tzi;
-
+
tz = guess_timezone(DATE_TIMEZONEDB TSRMLS_CC);
tzi = php_date_parse_tzfile(tz, DATE_TIMEZONEDB TSRMLS_CC);
if (! tzi) {
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.h?r1=1.45r2=1.46diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.45 php-src/ext/date/php_date.h:1.46
--- php-src/ext/date/php_date.h:1.45Sun May 3 19:57:35 2009
+++ php-src/ext/date/php_date.h Sun May 31 21:29:54 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.h,v 1.45 2009/05/03 19:57:35 derick Exp $ */
+/* $Id: php_date.h,v 1.46 2009/05/31 21:29:54 stas Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -153,7 +153,7 @@
ZEND_BEGIN_MODULE_GLOBALS(date)
char *default_timezone;
char *timezone;
- HashTable tzcache;
+ HashTable *tzcache;
timelib_error_container *last_errors;
ZEND_END_MODULE_GLOBALS(date)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
stasSun May 31 21:31:16 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: fix for #48247 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1535r2=1.2027.2.547.2.1536diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1535 php-src/NEWS:1.2027.2.547.2.1536 --- php-src/NEWS:1.2027.2.547.2.1535Sun May 31 14:14:07 2009 +++ php-src/NEWSSun May 31 21:31:15 2009 @@ -12,6 +12,7 @@ files). (Pierre) - Fixed bug #48359 (Script hangs on snmprealwalk if OID is not increasing). (Ilia, simonov at gmail dot com) +- Fixed bug #48247 PHP crashes on errors during startup. (Stas) - Fixed bug #42143 (The constant NAN is reported as 0 on Windows) (Kanwaljeet Singla, Venkat Raman Don) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang 045.phpt
colder Sun May 31 21:32:20 2009 UTC
Added files:
/php-src/tests/lang 045.phpt
Log:
Add test for the timeout inside shutdown function
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/045.phpt?view=markuprev=1.1
Index: php-src/tests/lang/045.phpt
+++ php-src/tests/lang/045.phpt
--TEST--
Timeout again inside register_shutdown_function
--FILE--
?php
set_time_limit(1);
register_shutdown_function(plop);
function plop() {
$ts = time();
while(true) {
if ((time()-$ts) 2) {
echo Failed!;
break;
}
}
}
plop();
?
===DONE===
--EXPECTF--
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /tests/lang 045.phpt
colder Sun May 31 21:32:42 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/tests/lang 045.phpt
Log:
MFH: Add test for the timeout inside shutdown function
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/045.phpt?view=markuprev=1.1
Index: php-src/tests/lang/045.phpt
+++ php-src/tests/lang/045.phpt
--TEST--
Timeout again inside register_shutdown_function
--FILE--
?php
set_time_limit(1);
register_shutdown_function(plop);
function plop() {
$ts = time();
while(true) {
if ((time()-$ts) 2) {
echo Failed!;
break;
}
}
}
plop();
?
===DONE===
--EXPECTF--
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
Fatal error: Maximum execution time of 1 second exceeded in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
