[PHP-CVS] cvs: php4 /ext/standard datetime.c
sas Sat Feb 24 13:18:29 2001 EDT Modified files: /php4/ext/standard datetime.c Log: Don't assume that tzname exists, if tm_zone does not exist. PR: #9380 Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.66 php4/ext/standard/datetime.c:1.67 --- php4/ext/standard/datetime.c:1.66 Fri Feb 9 07:28:23 2001 +++ php4/ext/standard/datetime.cSat Feb 24 13:18:28 2001 @@ -19,7 +19,7 @@ */ -/* $Id: datetime.c,v 1.66 2001/02/09 15:28:23 rasmus Exp $ */ +/* $Id: datetime.c,v 1.67 2001/02/24 21:18:28 sas Exp $ */ #include "php.h" @@ -260,7 +260,7 @@ case 'T': /* timezone name */ #if HAVE_TM_ZONE size += strlen(ta-tm_zone); -#else +#elif HAVE_TZNAME size += strlen(tzname[0]); #endif break; @@ -452,7 +452,7 @@ case 'T': /* timezone name */ #if HAVE_TM_ZONE strcat(return_value-value.str.val, ta-tm_zone); -#else +#elif HAVE_TZNAME strcat(return_value-value.str.val, tzname[0]); #endif break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/standard datetime.c file.c
rasmus Fri Feb 9 07:28:23 2001 EDT
Modified files:
/php4/ext/standard datetime.c file.c
Log:
What the heck is CUT? Assume someone meant UTC here. And fix a
warning.
Index: php4/ext/standard/datetime.c
diff -u php4/ext/standard/datetime.c:1.65 php4/ext/standard/datetime.c:1.66
--- php4/ext/standard/datetime.c:1.65 Thu Jan 18 06:36:43 2001
+++ php4/ext/standard/datetime.cFri Feb 9 07:28:23 2001
@@ -19,7 +19,7 @@
*/
-/* $Id: datetime.c,v 1.65 2001/01/18 14:36:43 andrei Exp $ */
+/* $Id: datetime.c,v 1.66 2001/02/09 15:28:23 rasmus Exp $ */
#include "php.h"
@@ -521,7 +521,7 @@
/* }}} */
/* {{{ proto string gmdate(string format [, int timestamp])
- Format a GMT/CUT date/time */
+ Format a GMT/UTC date/time */
PHP_FUNCTION(gmdate)
{
php_date(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
@@ -762,7 +762,7 @@
/* }}} */
/* {{{ proto string gmstrftime(string format [, int timestamp])
- Format a GMT/CUT time/date according to locale settings */
+ Format a GMT/UCT time/date according to locale settings */
PHP_FUNCTION(gmstrftime)
{
_php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.137 php4/ext/standard/file.c:1.138
--- php4/ext/standard/file.c:1.137 Thu Feb 1 02:24:02 2001
+++ php4/ext/standard/file.cFri Feb 9 07:28:23 2001
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: file.c,v 1.137 2001/02/01 10:24:02 stas Exp $ */
+/* $Id: file.c,v 1.138 2001/02/09 15:28:23 rasmus Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2083,7 +2083,7 @@
ptr = *buf = emalloc(step);
max_len = step;
- while(ret = FP_FREAD(ptr, max_len - len, socket, fp, issock)) {
+ while((ret = FP_FREAD(ptr, max_len - len, socket, fp, issock))) {
len += ret;
if(len + min_room = max_len) {
*buf = erealloc(*buf, max_len + step);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/standard datetime.c
andrei Thu Jan 18 06:36:43 2001 EDT Modified files: /php4/ext/standard datetime.c Log: @- Fixed 'O' and 'r' flags of date() to have correct sign for timezone @ offset. (Andrei) Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.64 php4/ext/standard/datetime.c:1.65 --- php4/ext/standard/datetime.c:1.64 Wed Jan 17 13:09:16 2001 +++ php4/ext/standard/datetime.cThu Jan 18 06:36:43 2001 @@ -19,7 +19,7 @@ */ -/* $Id: datetime.c,v 1.64 2001/01/17 21:09:16 andrei Exp $ */ +/* $Id: datetime.c,v 1.65 2001/01/18 14:36:43 andrei Exp $ */ #include "php.h" @@ -433,7 +433,7 @@ #if HAVE_TM_GMTOFF sprintf(tmp_buff, "%c%02d%02d", (ta-tm_gmtoff 0) ? '-' : '+', abs(ta-tm_gmtoff / 3600), abs( ta-tm_gmtoff % 3600)); #else - sprintf(tmp_buff, "%c%02d%02d", ((ta-tm_isdst ? timezone - 3600:timezone)0)?'-':'+',abs((ta-tm_isdst ? timezone - 3600 : timezone) / 3600), abs((ta-tm_isdst ? timezone - 3600 : timezone) % 3600)); + sprintf(tmp_buff, "%c%02d%02d", ((ta-tm_isdst ? +timezone - 3600:timezone)0)?'-':'+',abs((ta-tm_isdst ? timezone - 3600 : timezone) +/ 3600), abs((ta-tm_isdst ? timezone - 3600 : timezone) % 3600)); #endif strcat(return_value-value.str.val, tmp_buff); break; @@ -493,7 +493,7 @@ ta-tm_hour, ta-tm_min, ta-tm_sec, - ((ta-tm_isdst ? timezone - 3600 : timezone) 0) ? '-' : '+', + ((ta-tm_isdst ? timezone - 3600 : timezone) +0) ? '-' : '+', abs((ta-tm_isdst ? timezone - 3600 : timezone) / 3600), abs((ta-tm_isdst ? timezone - 3600 : timezone) % 3600) ); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/standard datetime.c
david Tue Jan 9 20:01:02 2001 EDT Modified files: /php4/ext/standard datetime.c Log: Allocate buffer in date() for the actual length of the timezone (bug#8292) Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.60 php4/ext/standard/datetime.c:1.61 --- php4/ext/standard/datetime.c:1.60 Fri Jan 5 09:34:47 2001 +++ php4/ext/standard/datetime.cTue Jan 9 20:01:02 2001 @@ -19,7 +19,7 @@ */ -/* $Id: datetime.c,v 1.60 2001/01/05 17:34:47 dbeu Exp $ */ +/* $Id: datetime.c,v 1.61 2001/01/10 04:01:02 david Exp $ */ #include "php.h" @@ -255,8 +255,14 @@ break; case 'F': /* month, textual, full */ case 'l': /* day (of the week), textual */ - case 'T': /* timezone name */ size += 28; + break; + case 'T': /* timezone name */ +#if HAVE_TM_ZONE + size += strlen(ta-tm_zone); +#else + size += strlen(tzname[0]); +#endif break; case 'Z': /* timezone offset in seconds */ size += 6; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
