derick Wed Jan 3 14:46:24 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/date php_date.c
Log:
- Fixed bug #40012 (php_date.c doesnt compile on Netware).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.469&r2=1.2027.2.547.2.470&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.469 php-src/NEWS:1.2027.2.547.2.470
--- php-src/NEWS:1.2027.2.547.2.469 Tue Jan 2 15:29:09 2007
+++ php-src/NEWS Wed Jan 3 14:46:23 2007
@@ -17,6 +17,8 @@
__inet_pton() and inet_ntop() was named __inet_ntop(). (Hannes)
- Fixed the validate email filter so that the letter "v" can also be used in
the user part of the email address. (Derick)
+- Fixed bug #40012 (php_date.c doesnt compile on Netware). (gk at gknw dot de,
+ Derick)
- Fixed bug #39984 (redirect response code in header() could be ignored in
CGI sapi). (Ilia)
- Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.37&r2=1.43.2.45.2.38&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.37
php-src/ext/date/php_date.c:1.43.2.45.2.38
--- php-src/ext/date/php_date.c:1.43.2.45.2.37 Mon Jan 1 09:35:48 2007
+++ php-src/ext/date/php_date.c Wed Jan 3 14:46:23 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.37 2007/01/01 09:35:48 sebastian Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.38 2007/01/03 14:46:23 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -623,6 +623,14 @@
}
return tzid;
}
+#elif defined(NETWARE)
+ /* Try to guess timezone from system information */
+ {
+ char *tzid = timelib_timezone_id_from_abbr("", ((_timezone *
-1) + (daylightOffset * daylightOnOff)), daylightOnOff);
+ if (tzid) {
+ return tzid;
+ }
+ }
#endif
/* Fallback to UTC */
php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We had to
select 'UTC' because your platform doesn't provide functionality for the
guessing algorithm");
@@ -2061,7 +2069,7 @@
PHP_FUNCTION(timezone_name_from_abbr)
{
char *abbr;
- char *tzname;
+ char *tzid;
int abbr_len;
long gmtoffset = -1;
long isdst = -1;
@@ -2069,10 +2077,10 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &abbr,
&abbr_len, &gmtoffset, &isdst) == FAILURE) {
RETURN_FALSE;
}
- tzname = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst);
+ tzid = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst);
- if (tzname) {
- RETURN_STRING(tzname, 1);
+ if (tzid) {
+ RETURN_STRING(tzid, 1);
} else {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
