un-experimental for __FILE__ __DIR__ handling after files moved/hardlinked

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1277 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
10 years ago · 96e1893175
parent 401eee2b01
commit 96e1893175
3 changed files with 4 additions and 11 deletions
--- a/1
+++ b/1
@ -4,6 +4,7 @@ ChangeLog
 * disassembler: fixes crash with nested sandbox
 * adds support for PHP_5_5
 * compatible with fcntl fork
+ * support for __FILE__ __DIR__ handling after files moved/hardlinked (without xcache.experimental)

 3.0.3 2013-16.18
 ========
--- a/1
+++ b/1
@ -3,6 +3,7 @@
 * disassembler now working again (fail since 3.0)
 * adds support for PHP_5_5
 * compatible with fcntl fork
+ * support for __FILE__ __DIR__ handling after files moved/hardlinked

 3.0.3 2013-16.18
 ========
--- a/mod_cacher/xc_cacher.c
+++ b/mod_cacher/xc_cacher.c
@ -237,17 +237,8 @@ static inline zend_bool xc_entry_equal_unlocked(xc_entry_type_t type, const xc_e
 				if (php_entry1->file_inode && php_entry2->file_inode) {
 					zend_bool inodeIsSame = php_entry1->file_inode == php_entry2->file_inode
 						                 && php_entry1->file_device == php_entry2->file_device;
-					if (XG(experimental)) {
-						/* new experimental behavior: quick check by inode, first */
-						if (!inodeIsSame) {
-							return 0;
-						}
-
-						/* and then opened_path compare */
-					}
-					else {
-						/* old behavior: inode check only */
-						return inodeIsSame;
+					if (!inodeIsSame) {
+						return 0;
 					}
 				}
 			}