summaryrefslogtreecommitdiff
path: root/main/safe_mode.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/safe_mode.c')
-rw-r--r--main/safe_mode.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/main/safe_mode.c b/main/safe_mode.c
index 0caaeb960..8b9886374 100644
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: safe_mode.c,v 1.62.2.1 2006/01/01 12:50:17 sniper Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.2 2006/07/01 11:35:34 nlopess Exp $ */
#include "php.h"
@@ -45,7 +45,7 @@
* 5 - only check file
*/
-PHPAPI int php_checkuid_ex(const char *filename, char *fopen_mode, int mode, int flags)
+PHPAPI int php_checkuid_ex(const char *filename, const char *fopen_mode, int mode, int flags)
{
struct stat sb;
int ret, nofile=0;
@@ -153,8 +153,6 @@ PHPAPI int php_checkuid_ex(const char *filename, char *fopen_mode, int mode, int
} else if (PG(safe_mode_gid) && dgid == php_getgid()) {
return 1;
} else {
- TSRMLS_FETCH();
-
if (SG(rfc1867_uploaded_files)) {
if (zend_hash_exists(SG(rfc1867_uploaded_files), (char *) filename, strlen(filename)+1)) {
return 1;
@@ -188,7 +186,7 @@ PHPAPI int php_checkuid_ex(const char *filename, char *fopen_mode, int mode, int
return 0;
}
-PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode) {
+PHPAPI int php_checkuid(const char *filename, const char *fopen_mode, int mode) {
#ifdef NETWARE
/* NetWare don't have uid*/
return 1;