Changeset 132

Timestamp:

11/16/05 13:33:30 (3 years ago)

Author:

zoeloelip

Message:

Patch for bug #1259695 from Alexy

Files:

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

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2005-11-16 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * Patch for including files in same directory (#1259695) from Alexy
+
-2005-11-15 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
-        * Spinlock test now tests for i386 and x86_64. Because spinlocks where
-          never used on 64-bit and sysv ipc locking didn't work, there were a 

eaccelerator/trunk/eaccelerator.c

@@ -1102 +1102 @@
-      ptr = end;
-    }
+
+        if (zend_is_executing(TSRMLS_C)) {
+                strncpy(tryname, zend_get_executed_filename(TSRMLS_C), MAXPATHLEN);
+                tryname[MAXPATHLEN - 1] = 0;
+                int tryname_length = strlen(tryname);
+
+                while (tryname_length >= 0 && !IS_SLASH(tryname[tryname_length]))
+                        tryname_length--;
+                if (tryname_length > 0 && tryname[0] != '[' // [no active file]
+                        && tryname_length + filename_len + 1 < MAXPATHLEN)
+                {
+                        strncpy(tryname + tryname_length + 1, file_handle->filename, filename_len + 1);
+                        if (stat(tryname, buf) == 0 && S_ISREG(buf->st_mode))
+                                return 0;
+                }
+        }
-  }
-  return -1;