[PHP-CVS] cvs: php-src(PHP_5_2) /main safe_mode.c

2008-07-24 Thread Felipe Pena 
felipe  Thu Jul 24 16:02:00 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   safe_mode.c 
  Log:
  - MFB: Removed unused variable.
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.16&r2=1.62.2.1.2.17&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.16 
php-src/main/safe_mode.c:1.62.2.1.2.17
--- php-src/main/safe_mode.c:1.62.2.1.2.16  Mon Jul 21 19:34:45 2008
+++ php-src/main/safe_mode.cThu Jul 24 16:01:59 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.16 2008/07/21 19:34:45 felipe Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.17 2008/07/24 16:01:59 felipe Exp $ */
 
 #include "php.h"
 
@@ -52,7 +52,6 @@
long uid=0L, gid=0L, duid=0L, dgid=0L;
char path[MAXPATHLEN];
char *s, filenamecopy[MAXPATHLEN];
-   php_stream_wrapper *wrapper = NULL;
TSRMLS_FETCH();
 
path[0] = '\0';



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /main safe_mode.c

2007-10-11 Thread Jani Taskinen 
janiThu Oct 11 09:33:53 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   safe_mode.c 
  Log:
  MFB53
  
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.12&r2=1.62.2.1.2.13&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.12 
php-src/main/safe_mode.c:1.62.2.1.2.13
--- php-src/main/safe_mode.c:1.62.2.1.2.12  Thu Oct 11 08:28:02 2007
+++ php-src/main/safe_mode.cThu Oct 11 09:33:53 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.12 2007/10/11 08:28:02 jani Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.13 2007/10/11 09:33:53 jani Exp $ */
 
 #include "php.h"
 
@@ -89,13 +89,12 @@
 #if HAVE_BROKEN_GETCWD
char ftest[MAXPATHLEN];
 
-   strcpy(ftest,filename);
+   strcpy(ftest, filename);
if (VCWD_GETCWD(ftest, sizeof(ftest)) == NULL) {
-   strcpy(path,filename);
-   } else {
-   expand_filepath(filename, path TSRMLS_CC);
-   }
+   strcpy(path, filename);
+   } else
 #endif
+   expand_filepath(filename, path TSRMLS_CC);
 
ret = VCWD_STAT(path, &sb);
if (ret < 0) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /main safe_mode.c

2007-10-11 Thread Jani Taskinen 
janiThu Oct 11 08:28:02 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   safe_mode.c 
  Log:
  MF53
  
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.11&r2=1.62.2.1.2.12&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.11 
php-src/main/safe_mode.c:1.62.2.1.2.12
--- php-src/main/safe_mode.c:1.62.2.1.2.11  Wed Oct 10 23:54:39 2007
+++ php-src/main/safe_mode.cThu Oct 11 08:28:02 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.11 2007/10/10 23:54:39 ab5602 Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.12 2007/10/11 08:28:02 jani Exp $ */
 
 #include "php.h"
 
@@ -86,14 +86,16 @@
 * If that fails, passthrough and check directory...
 */
if (mode != CHECKUID_ALLOW_ONLY_DIR) {
+#if HAVE_BROKEN_GETCWD
+   char ftest[MAXPATHLEN];
 
-char ftest[MAXPATHLEN];
-strcpy(ftest,filename);
-if (VCWD_GETCWD(ftest, sizeof(ftest)) == NULL) {
-strcpy(path,filename);
-} else {
-expand_filepath(filename, path TSRMLS_CC);
-}
+   strcpy(ftest,filename);
+   if (VCWD_GETCWD(ftest, sizeof(ftest)) == NULL) {
+   strcpy(path,filename);
+   } else {
+   expand_filepath(filename, path TSRMLS_CC);
+   }
+#endif
 
ret = VCWD_STAT(path, &sb);
if (ret < 0) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /main safe_mode.c

2007-10-10 Thread Robert Thompson 
ab5602  Wed Oct 10 23:54:39 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   safe_mode.c 
  Log:
  
  Fix for bug 41899, safe mode and relative paths with Solaris's broken 
getcwd().
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.10&r2=1.62.2.1.2.11&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.10 
php-src/main/safe_mode.c:1.62.2.1.2.11
--- php-src/main/safe_mode.c:1.62.2.1.2.10  Sun Sep 23 15:19:21 2007
+++ php-src/main/safe_mode.cWed Oct 10 23:54:39 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.10 2007/09/23 15:19:21 iliaa Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.11 2007/10/10 23:54:39 ab5602 Exp $ */
 
 #include "php.h"
 
@@ -86,7 +86,15 @@
 * If that fails, passthrough and check directory...
 */
if (mode != CHECKUID_ALLOW_ONLY_DIR) {
-   expand_filepath(filename, path TSRMLS_CC);
+
+char ftest[MAXPATHLEN];
+strcpy(ftest,filename);
+if (VCWD_GETCWD(ftest, sizeof(ftest)) == NULL) {
+strcpy(path,filename);
+} else {
+expand_filepath(filename, path TSRMLS_CC);
+}
+
ret = VCWD_STAT(path, &sb);
if (ret < 0) {
if (mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /main safe_mode.c

2007-01-12 Thread Hannes Magnusson 
bjori   Fri Jan 12 12:11:18 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   safe_mode.c 
  Log:
  Typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.7&r2=1.62.2.1.2.8&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.7 
php-src/main/safe_mode.c:1.62.2.1.2.8
--- php-src/main/safe_mode.c:1.62.2.1.2.7   Fri Jan 12 01:46:11 2007
+++ php-src/main/safe_mode.cFri Jan 12 12:11:18 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.7 2007/01/12 01:46:11 iliaa Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.8 2007/01/12 12:11:18 bjori Exp $ */
 
 #include "php.h"
 
@@ -235,7 +235,7 @@
char *pwbuf;
 
if (pwbuflen < 1) {
-   return ""
+   return "";
}
pwbuf = emalloc(pwbuflen);
if (getpwuid_r(pstat->st_uid, &_pw, pwbuf, pwbuflen, &retpwptr) 
!= 0) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /main safe_mode.c

2006-06-01 Thread Antony Dovgal 
tony2001Thu Jun  1 14:06:23 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   safe_mode.c 
  Log:
  no need to do TSRMLS_FETCH() twice
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/safe_mode.c?r1=1.62.2.1&r2=1.62.2.1.2.1&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1 php-src/main/safe_mode.c:1.62.2.1.2.1
--- php-src/main/safe_mode.c:1.62.2.1   Sun Jan  1 12:50:17 2006
+++ php-src/main/safe_mode.cThu Jun  1 14:06:23 2006
@@ -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.1 2006/06/01 14:06:23 tony2001 Exp $ */
 
 #include "php.h"
 
@@ -153,8 +153,6 @@
} 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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php