Attachment 41465 Details for Bug 64899 – file.diff

[patch] file.diff

file.diff (text/plain), 1.53 KB, created by Martin Matuska on 2004-03-29 18:20:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2004-03-29 18:20:14 UTC

Size: 1.53 KB

patch

obsolete

>diff -Nbur php4_orig/Makefile php4/Makefile
>--- php4_orig/Makefile	Mon Mar 29 19:02:44 2004
>+++ php4/Makefile	Mon Mar 29 19:02:51 2004
>@@ -21,7 +21,7 @@
> 
> PORTNAME=	php4
> PORTVERSION=	4.3.5
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES?=	lang devel www
> MASTER_SITES=	http://www.php.net/distributions/:release \
> 		http://it.php.net/distributions/:release \
>diff -Nbur php4_orig/files/patch-ext::standard::datetime.c php4/files/patch-ext::standard::datetime.c
>--- php4_orig/files/patch-ext::standard::datetime.c	Thu Jan  1 01:00:00 1970
>+++ php4/files/patch-ext::standard::datetime.c	Mon Mar 29 18:54:04 2004
>@@ -0,0 +1,27 @@
>+--- ext/standard/datetime.c.orig	Mon Mar 29 18:52:50 2004
>++++ ext/standard/datetime.c	Mon Mar 29 18:53:46 2004
>+@@ -19,7 +19,7 @@
>+  */
>+ 
>+ 
>+-/* $Id: datetime.c,v 1.96.2.12 2004/03/12 17:27:55 rasmus Exp $ */
>++/* $Id: datetime.c,v 1.96.2.13 2004/03/26 19:29:31 rasmus Exp $ */
>+ 
>+ 
>+ #include "php.h"
>+@@ -194,12 +194,12 @@
>+ 		val = (*arguments[0])->value.lval; 
>+ 		/* 
>+ 		   We don't use 1 here to work around problems in some mktime implementations
>+-		   when it comes to daylight savings time.  Setting it to 2 and working back from
>++		   when it comes to daylight savings time.  Setting it to 4 and working back from
>+ 		   there with the chgsecs offset makes us immune to these problems.  
>+ 		   See http://bugs.php.net/27533 for more info.
>+ 		*/
>+-		if (val < 2) { 
>+-			chgsecs += (2-val) * 60*60; val = 2; 
>++		if (val < 4) { 
>++			chgsecs += (4-val) * 60*60; val = 4; 
>+ 		} 
>+ 		ta->tm_hour = val; 
>+ 		/* fall-through */

Actions: View | Diff

Attachments on bug 64899: 41465