Slight change for time on the return side.

@-Added 'I' switch to test whether or not DST is active.

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index f40e3d2fdc2cda26ee9cfec1d1a3de23bb56fd46..6604e21408fde1a41f88e07644f05c677a471702 100644 (file)
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -69,8 +69,7 @@ extern PHPAPI time_t parsedate(char *p, struct timeval *now);
 
 PHP_FUNCTION(time)
 {
-       return_value->value.lval = (long) time(NULL);
-       return_value->type = IS_LONG;
+       RETURN_LONG((long)time(NULL));
 }
 
 void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm)
@@ -270,6 +269,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
                                size += 3;
                                break;
                        case 'w':               /* day of the week, numeric */
+                       case 'I':               /* DST? */
                        default:
                                size++;
                                break;
@@ -420,6 +420,10 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
                                sprintf(tmp_buff, "%03d", beat); /* SAFE */
                                strcat(return_value->value.str.val, tmp_buff);
                                break;
+                       case 'I':
+                               sprintf(tmp_buff, "%d", ta->tm_isdst);
+                               strcat(return_value->value.str.val, tmp_buff);
+                               break;
                        default:
                                length = strlen(return_value->value.str.val);
                                return_value->value.str.val[length] = (*format)->value.str.val[i];