Changeset 252

Timestamp:

07/29/06 01:11:25 (2 years ago)

Author:

bart

Message:

Use php realpath directly without wrapper, TSRM implements the realpath cache

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.c (modified) (3 diffs)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-07-29  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * Use php realpath directly without wrapper, TSRM implements the realpath cache
+
-2006-07-28  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/eaccelerator.c

@@ -1054 +1054 @@
-}
-
-#ifndef EACCELERATOR_USE_INODE
-static char* eaccelerator_realpath(const char* name, char* realname TSRMLS_DC) {
-/* ???TODO it is possibe to cache name->realname mapping to avoid lstat() calls */
-#if ZEND_MODULE_API_NO >= 20001222
-  return VCWD_REALPATH(name, realname);
-#else
-  return V_REALPATH(name, realname);
-#endif
-}
-#endif
-
-static int eaccelerator_stat(zend_file_handle *file_handle,
-                        char* realname, struct stat* buf TSRMLS_DC) {
@@ -1179 +1168 @@
-             IS_SLASH(file_handle->filename[0]) ||
-             IS_ABSOLUTE_PATH(file_handle->filename,strlen(file_handle->filename))) {
-eaccelerator_realpath(file_handle->filename, realname TSRMLS_CC
+VCWD_REALPATH(file_handle->filename, realname
-      if (!eaccelerator_check_mtime) {
-        return 0;
@@ -1210 +1199 @@
-        memcpy(tryname+len+1, file_handle->filename, filename_len);
-        tryname[len+filename_len+1] = '\0';
-eaccelerator_realpath(tryname, realname TSRMLS_CC
+VCWD_REALPATH(tryname, realname
-#ifdef ZEND_WIN32
-          if (stat(realname, buf) == 0 &&