cvs: TSRM(PHP_5_2) / tsrm_virtual_cwd.c

tony2001                Fri Jan 19 21:00:35 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /TSRM       tsrm_virtual_cwd.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.17&r2=1.74.2.9.2.18&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.17 
TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.18
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.17       Tue Jan 16 14:02:19 2007
+++ TSRM/tsrm_virtual_cwd.c     Fri Jan 19 21:00:35 2007
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.17 2007/01/16 14:02:19 tony2001 Exp $ 
*/
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.18 2007/01/19 21:00:35 tony2001 Exp $ 
*/
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -482,7 +482,7 @@
                path_length = orig_path_len; 
        }
 
-       if (use_realpath && CWDG(realpath_cache_size_limit)) {
+       if (use_realpath != CWD_EXPAND && CWDG(realpath_cache_size_limit)) {
                t = CWDG(realpath_cache_ttl)?time(NULL):0;
                if ((bucket = realpath_cache_find(path, path_length, t 
TSRMLS_CC)) != NULL) {           
                        int len = bucket->realpath_len;
@@ -502,7 +502,7 @@
                }
        }
 
-       if (use_realpath) {
+       if (use_realpath != CWD_EXPAND) {
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
                char resolved_path[MAXPATHLEN];
 
@@ -609,7 +609,7 @@
                                memcpy(&state->cwd[state->cwd_length], ptr, 
ptr_length+1);
 
 #ifdef TSRM_WIN32
-                               if (use_realpath) {
+                               if (use_realpath != CWD_EXPAND) {
                                        WIN32_FIND_DATA data;
                                        HANDLE hFind;
 
@@ -641,7 +641,7 @@
                }
        }
 
-       if (use_realpath && CWDG(realpath_cache_size_limit)) {
+       if (use_realpath != CWD_EXPAND && CWDG(realpath_cache_size_limit)) {
                realpath_cache_add(path, path_length, state->cwd, 
state->cwd_length, t TSRMLS_CC);
        }
 

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