cvs: TSRM(PHP_5_2) / tsrm_virtual_cwd.c
| From: | Rasmus Lerdorf | Date: | Fri, 25 May 2007 22:53:34 +0000 |
| Subject: | cvs: TSRM(PHP_5_2) / tsrm_virtual_cwd.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-5817@lists.php.net to get a copy of this message | ||
rasmus Fri May 25 22:53:34 2007 UTC
Modified files: (Branch: PHP_5_2)
/TSRM tsrm_virtual_cwd.c
Log:
Remove simple optimization here for now until we clean up this SAPI/TSRM
mess.
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.27&r2=1.74.2.9.2.28&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.27 TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.28
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.27 Fri May 18 11:36:55 2007
+++ TSRM/tsrm_virtual_cwd.c Fri May 25 22:53:34 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.27 2007/05/18 11:36:55 rasmus Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.28 2007/05/25 22:53:34 rasmus Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -31,7 +31,6 @@
#include "tsrm_virtual_cwd.h"
#include "tsrm_strtok_r.h"
-#include "SAPI.h"
#ifdef TSRM_WIN32
#include <io.h>
@@ -519,7 +518,7 @@
}
if (use_cache) {
- t = CWDG(realpath_cache_ttl)?sapi_get_request_time(TSRMLS_C):0;
+ t = CWDG(realpath_cache_ttl)?time(0):0;
if ((bucket = realpath_cache_find(path, path_length, t TSRMLS_CC)) != NULL) {
int len = bucket->realpath_len;