Fix for CVE-2008-2665 and CVE-2008-2666.

Obtained from:	PHP CVS
This commit is contained in:
Alex Dupre 2008-09-04 13:55:11 +00:00
parent e04835105a
commit 067f51c23a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=219835
4 changed files with 36 additions and 2 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= php5
PORTVERSION= 5.2.6
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions

View File

@ -0,0 +1,17 @@
--- main/safe_mode.c.orig 2008-09-04 15:52:19.000000000 +0200
+++ main/safe_mode.c 2008-09-04 15:52:35.000000000 +0200
@@ -74,14 +74,6 @@
}
}
- /*
- * If given filepath is a URL, allow - safe mode stuff
- * related to URL's is checked in individual functions
- */
- wrapper = php_stream_locate_url_wrapper(filename, NULL, STREAM_LOCATE_WRAPPERS_ONLY TSRMLS_CC);
- if (wrapper != NULL)
- return 1;
-
/* First we see if the file is owned by the same user...
* If that fails, passthrough and check directory...
*/

View File

@ -7,7 +7,7 @@
PORTNAME= php5
PORTVERSION= 5.2.6
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions

View File

@ -0,0 +1,17 @@
--- main/safe_mode.c.orig 2008-09-04 15:52:19.000000000 +0200
+++ main/safe_mode.c 2008-09-04 15:52:35.000000000 +0200
@@ -74,14 +74,6 @@
}
}
- /*
- * If given filepath is a URL, allow - safe mode stuff
- * related to URL's is checked in individual functions
- */
- wrapper = php_stream_locate_url_wrapper(filename, NULL, STREAM_LOCATE_WRAPPERS_ONLY TSRMLS_CC);
- if (wrapper != NULL)
- return 1;
-
/* First we see if the file is owned by the same user...
* If that fails, passthrough and check directory...
*/