clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

last set of zts fixes

Browse Source
This commit is contained in:
Ilia Alshanetsky 2006-11-30 16:38:37 +00:00
parent c69555b948
commit ca89b6dedd
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <time.h> #include <time.h>
#include "main/php_reentrancy.h"
#ifndef SQLITE_OMIT_DATETIME_FUNCS #ifndef SQLITE_OMIT_DATETIME_FUNCS
@ -393,7 +394,7 @@ static void clearYMD_HMS_TZ(DateTime *p){
static double localtimeOffset(DateTime *p){ static double localtimeOffset(DateTime *p){
DateTime x, y; DateTime x, y;
time_t t; time_t t;
struct tm *pTm; struct tm *pTm, tmbuf;
x = *p; x = *p;
computeYMD_HMS(&x); computeYMD_HMS(&x);
if( x.Y<1971 || x.Y>=2038 ){ if( x.Y<1971 || x.Y>=2038 ){
@ -412,7 +413,8 @@ static double localtimeOffset(DateTime *p){
computeJD(&x); computeJD(&x);
t = (x.rJD-2440587.5)*86400.0 + 0.5; t = (x.rJD-2440587.5)*86400.0 + 0.5;
sqlite3OsEnterMutex(); sqlite3OsEnterMutex();
pTm = localtime(&t); pTm = php_localtime_r
(&t, &tmbuf);
y.Y = pTm->tm_year + 1900; y.Y = pTm->tm_year + 1900;
y.M = pTm->tm_mon + 1; y.M = pTm->tm_mon + 1;
y.D = pTm->tm_mday; y.D = pTm->tm_mday;

5
ext/sqlite/libsqlite/src/date.c
View File

@ -53,6 +53,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <time.h> #include <time.h>
#include "main/php_reentrancy.h"
#ifndef SQLITE_OMIT_DATETIME_FUNCS #ifndef SQLITE_OMIT_DATETIME_FUNCS
@ -397,7 +398,7 @@ static void clearYMD_HMS_TZ(DateTime *p){
static double localtimeOffset(DateTime *p){ static double localtimeOffset(DateTime *p){
DateTime x, y; DateTime x, y;
time_t t; time_t t;
struct tm *pTm; struct tm *pTm, tmbuf;
x = *p; x = *p;
computeYMD_HMS(&x); computeYMD_HMS(&x);
if( x.Y<1971 || x.Y>=2038 ){ if( x.Y<1971 || x.Y>=2038 ){
@ -416,7 +417,7 @@ static double localtimeOffset(DateTime *p){
computeJD(&x); computeJD(&x);
t = (x.rJD-2440587.5)*86400.0 + 0.5; t = (x.rJD-2440587.5)*86400.0 + 0.5;
sqliteOsEnterMutex(); sqliteOsEnterMutex();
pTm = localtime(&t); pTm = php_localtime_r(&t, &tmbuf);
y.Y = pTm->tm_year + 1900; y.Y = pTm->tm_year + 1900;
y.M = pTm->tm_mon + 1; y.M = pTm->tm_mon + 1;
y.D = pTm->tm_mday; y.D = pTm->tm_mday;

8
ext/xmlrpc/libxmlrpc/xmlrpc.c
View File

@ -43,6 +43,9 @@ static const char rcsid[] = "#(@) $Id$";
* 9/1999 - 10/2000 * 9/1999 - 10/2000
* HISTORY * HISTORY
* $Log$ * $Log$
* Revision 1.8 2005/03/28 00:07:24 edink
* Reshufle includes to make it compile on windows
*
* Revision 1.7 2005/03/26 03:13:58 sniper * Revision 1.7 2005/03/26 03:13:58 sniper
* - Made it possible to build ext/xmlrpc with libxml2 * - Made it possible to build ext/xmlrpc with libxml2
* *
@ -123,6 +126,7 @@ static const char rcsid[] = "#(@) $Id$";
*******/ *******/
#include "ext/xml/expat_compat.h" #include "ext/xml/expat_compat.h"
#include "main/php_reentrancy.h"
#ifdef _WIN32 #ifdef _WIN32
#include "xmlrpc_win32.h" #include "xmlrpc_win32.h"
#endif #endif
@ -227,8 +231,8 @@ static int date_from_ISO8601 (const char *text, time_t * value) {
} }
static int date_to_ISO8601 (time_t value, char *buf, int length) { static int date_to_ISO8601 (time_t value, char *buf, int length) {
struct tm *tm; struct tm *tm, tmbuf;
tm = localtime(&value); tm = php_localtime_r(&value, &tmbuf);
#if 0 /* TODO: soap seems to favor this method. xmlrpc the latter. */ #if 0 /* TODO: soap seems to favor this method. xmlrpc the latter. */
return strftime (buf, length, "%Y-%m-%dT%H:%M:%SZ", tm); return strftime (buf, length, "%Y-%m-%dT%H:%M:%SZ", tm);
#else #else

11
ext/zip/lib/zip_dirent.c
View File

@ -33,8 +33,6 @@
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -47,6 +45,7 @@
#include "zip.h" #include "zip.h"
#include "zipint.h" #include "zipint.h"
#include "main/php_reentrancy.h"
static time_t _zip_d2u_time(int, int); static time_t _zip_d2u_time(int, int);
static char *_zip_readfpstr(FILE *, unsigned int, int, struct zip_error *); static char *_zip_readfpstr(FILE *, unsigned int, int, struct zip_error *);
@ -391,11 +390,11 @@ _zip_dirent_write(struct zip_dirent *zde, FILE *fp, int localp,
static time_t static time_t
_zip_d2u_time(int dtime, int ddate) _zip_d2u_time(int dtime, int ddate)
{ {
struct tm *tm; struct tm *tm, tmbuf;
time_t now; time_t now;
now = time(NULL); now = time(NULL);
tm = localtime(&now); tm = php_localtime_r(&now, &tmbuf);
tm->tm_year = ((ddate>>9)&127) + 1980 - 1900; tm->tm_year = ((ddate>>9)&127) + 1980 - 1900;
tm->tm_mon = ((ddate>>5)&15) - 1; tm->tm_mon = ((ddate>>5)&15) - 1;
@ -520,9 +519,9 @@ _zip_write4(unsigned int i, FILE *fp)
static void static void
_zip_u2d_time(time_t time, unsigned short *dtime, unsigned short *ddate) _zip_u2d_time(time_t time, unsigned short *dtime, unsigned short *ddate)
{ {
struct tm *tm; struct tm *tm, tmbuf;
tm = localtime(&time); tm = php_localtime_r(&time, &tmbuf);
*ddate = ((tm->tm_year+1900-1980)<<9) + ((tm->tm_mon+1)<<5) *ddate = ((tm->tm_year+1900-1980)<<9) + ((tm->tm_mon+1)<<5)
+ tm->tm_mday; + tm->tm_mday;
*dtime = ((tm->tm_hour)<<11) + ((tm->tm_min)<<5) *dtime = ((tm->tm_hour)<<11) + ((tm->tm_min)<<5)