cvs: /php3 ChangeLog /php3/functions string.c

jah Fri Oct 8 00:51:53 1999 EDT Modified files: /php3 ChangeLog /php3/functions string.c Log: Don't mark locale changed if we just peeked at the current value. Added ChangeLog entries. Index: php3/ChangeLog diff -u php3/ChangeLog:1.777 php3/ChangeLog:1.778 --- php3/ChangeLog:1.777 Tue Oct 5 09:28:44 1999 +++ php3/ChangeLog Fri Oct 8 00:51:52 1999 @@ -2,6 +2,11 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ???? ??, 1999, Version 3.0.13 +- Locale settings are restored correctly at request end if they + were changed in the script (Jouni) +- Fixed wrong values returned by gmmktime() and its inconsistent behaviour. + Now gmmktime([args]) == mktime([args]) + date('Z', mktime([args])) should + always be true (Jouni) - Proper handling of the slightly different behavior of Fdf Toolkit 4.0 (U. Steinmann) - Fixed LOB/Persistent-Connection related OCI8-Crash (Thies) - Added a function for applying a gamma correction to a GD image Index: php3/functions/string.c diff -u php3/functions/string.c:1.200 php3/functions/string.c:1.201 --- php3/functions/string.c:1.200 Thu Oct 7 18:16:58 1999 +++ php3/functions/string.c Fri Oct 8 00:51:52 1999 @@ -30,7 +30,7 @@ */ -/* $Id: string.c,v 1.200 1999/10/07 22:16:58 jah Exp $ */ +/* $Id: string.c,v 1.201 1999/10/08 04:51:52 jah Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -1825,10 +1825,12 @@ loc = NULL; else loc = locale->value.str.val; - retval = setlocale (cat, loc); + retval = setlocale(cat, loc); if (retval) { - STR_FREE(GLOBAL(locale_string)); - GLOBAL(locale_string) = estrdup(retval); + if (loc) { + STR_FREE(GLOBAL(locale_string)); + GLOBAL(locale_string) = estrdup(retval); + } RETVAL_STRING(retval,1); return;