head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.4
	OPENPKG_E1_MP:1.4
	OPENPKG_2_5_RELEASE:1.3
	OPENPKG_2_5_SOLID:1.3.0.2
	OPENPKG_2_5_SOLID_BP:1.3
	OPENPKG_2_4_RELEASE:1.2
	OPENPKG_2_4_SOLID:1.2.0.2
	OPENPKG_2_4_SOLID_BP:1.2
	OPENPKG_CW_FP:1.1
	OPENPKG_2_3_RELEASE:1.1
	OPENPKG_2_3_SOLID:1.1.0.2
	OPENPKG_2_3_SOLID_BP:1.1;
locks; strict;
comment	@# @;


1.4
date	2005.11.26.08.24.19;	author rse;	state dead;
branches;
next	1.3;
commitid	Xp84qvfAOF47ifbr;

1.3
date	2005.10.04.20.03.51;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2005.04.01.06.17.51;	author rse;	state dead;
branches;
next	1.1;

1.1
date	2005.02.17.17.04.19;	author rse;	state Exp;
branches;
next	;


desc
@@


1.4
log
@upgrading package: php5 5.0.5 -> 5.1.0
@
text
@Security Fix (CAN-2005-3054)

Index: main/fopen_wrappers.c
--- main/fopen_wrappers.c.orig	2005-07-16 14:14:44 +0200
+++ main/fopen_wrappers.c	2005-10-04 22:01:56 +0200
@@@@ -109,8 +109,8 @@@@
 		/* Handler for basedirs that end with a / */
 		resolved_basedir_len = strlen(resolved_basedir);
 		if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) {
-			if (resolved_basedir[resolved_basedir_len - 1] == '/') {
-				resolved_basedir[resolved_basedir_len - 1] = PHP_DIR_SEPARATOR;
+			if (resolved_basedir[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) {
+				resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
 				resolved_basedir[++resolved_basedir_len] = '\0';
 			}
 		}
@


1.3
log
@Security Fix (CAN-2005-3054)
@
text
@@


1.2
log
@upgrading package: php5 5.0.3 -> 5.0.4
@
text
@d1 16
a16 21
Index: Zend/zend_strtod.c
--- Zend/zend_strtod.c.orig	2004-12-14 09:41:35.000000000 +0100
+++ Zend/zend_strtod.c	2005-02-17 18:01:08.903522387 +0100
@@@@ -95,7 +95,7 @@@@
 static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $";
 #endif /* LIBC_SCCS and not lint */
 
-#if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
+#if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || defined(__ia64__) || \
     defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
     defined(__powerpc__) || defined(__ppc__) || defined(__m88k__) || \
     defined(__hppa__) || defined(__x86_64__) || (defined(__arm__) && \
@@@@ -127,7 +127,7 @@@@
 #define IEEE_LITTLE_ENDIAN
 #endif
 
-#if defined(__sparc__) || defined(__ppc__)
+#if defined(__sparc__) || defined(__ppc__) || defined(__sun__)
 #define u_int32_t uint32_t
 #endif
 
@


1.1
log
@port to Itantium and Solaris
@
text
@@