archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

php_localtime_r() checks

Browse source
This commit is contained in:
Antony Dovgal 2007-06-07 09:07:12 +00:00
parent 976a22df16
commit f1f0deae4c
5 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/calendar/easter.c
View file

@ -36,10 +36,14 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, int gm)
/* Default to the current year if year parameter is not given */
{
time_t a;
struct tm b;
struct tm b, *res;
time(&a);
php_localtime_r(&a, &b);
year = 1900 + b.tm_year;
res = php_localtime_r(&a, &b);
if (!res) {
year = 1900;
} else {
year = 1900 + b.tm_year;
}
}
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,

6
ext/pdo_sqlite/sqlite/src/date.c
View file

@ -415,8 +415,10 @@ static double localtimeOffset(DateTime *p){
computeJD(&x);
t = (x.rJD-2440587.5)*86400.0 + 0.5;
sqlite3OsEnterMutex();
pTm = php_localtime_r
(&t, &tmbuf);
pTm = php_localtime_r(&t, &tmbuf);
if (!pTm) {
return 0;
}
y.Y = pTm->tm_year + 1900;
y.M = pTm->tm_mon + 1;
y.D = pTm->tm_mday;

3
ext/sqlite/libsqlite/src/date.c
View file

@ -418,6 +418,9 @@ static double localtimeOffset(DateTime *p){
t = (x.rJD-2440587.5)*86400.0 + 0.5;
sqliteOsEnterMutex();
pTm = php_localtime_r(&t, &tmbuf);
if (!pTm) {
return 0;
}
y.Y = pTm->tm_year + 1900;
y.M = pTm->tm_mon + 1;
y.D = pTm->tm_mday;

2
ext/standard/info.c
View file

@ -1002,7 +1002,7 @@ PHPAPI char *php_logo_guid()
the_time = time(NULL);
ta = php_localtime_r(&the_time, &tmbuf);
if ((ta->tm_mon==3) && (ta->tm_mday==1)) {
if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
logo_guid = PHP_EGG_LOGO_GUID;
} else {
logo_guid = PHP_LOGO_GUID;

6
ext/xmlrpc/libxmlrpc/xmlrpc.c
View file

@ -43,6 +43,9 @@ static const char rcsid[] = "#(@) $Id$";
* 9/1999 - 10/2000
* HISTORY
* $Log$
* Revision 1.10 2007/01/01 09:29:33 sebastian
* Bump year.
*
* Revision 1.9 2007/11/30 16:38:53 iliaa
* zts fixes
*
@ -236,6 +239,9 @@ static int date_from_ISO8601 (const char *text, time_t * value) {
static int date_to_ISO8601 (time_t value, char *buf, int length) {
struct tm *tm, tmbuf;
tm = php_localtime_r(&value, &tmbuf);
if (!tm) {
return 0;
}
#if 0 /* TODO: soap seems to favor this method. xmlrpc the latter. */
return strftime (buf, length, "%Y-%m-%dT%H:%M:%SZ", tm);
#else