Optimized require_once/include_once (eliminated fopen() on second usage)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 3f77b92b2076bab4729a0a16ba7e4340ce6a8101..1b32b3b99baf0fdd11f0022c03359378eacad7d3 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -37,6 +37,9 @@
 #include "zend_interfaces.h"
 #include "zend_vm.h"
 
+/* Virtual current working directory support */
+#include "tsrm_virtual_cwd.h"
+
 #define _CONST_CODE  0
 #define _TMP_CODE    1
 #define _VAR_CODE    2

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index a5f3abc03ad1ceb515cd4efc8580400e423346c5..f95c18dc14538cecdf97d151d69461026cfe9788 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2692,16 +2692,29 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY)
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {
-                               int dummy = 1;
                                zend_file_handle file_handle;
+                               char cwd[MAXPATHLEN];
+                               cwd_state state;
 
-                               if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
+                               if (IS_ABSOLUTE_PATH(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename))) {
+                                       cwd[0] = '\0';
+                               } else if (!VCWD_GETCWD(cwd, MAXPATHLEN)) {
+                                       cwd[0] = '\0';
+                               }
+
+                               state.cwd_length = strlen(cwd);
+                               state.cwd = zend_strndup(cwd, state.cwd_length);
+
+                               if (!virtual_file_ex(&state, Z_STRVAL_P(inc_filename), NULL, 1) &&
+                                   zend_hash_exists(&EG(included_files), state.cwd, state.cwd_length+1)) {
+                                       failure_retval=1;
+                               } else if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
 
                                        if (!file_handle.opened_path) {
-                                               file_handle.opened_path = estrndup(inc_filename->value.str.val, inc_filename->value.str.len);
+                                               file_handle.opened_path = estrndup(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename));
                                        }
 
-                                       if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
+                                       if (zend_hash_add_empty_element(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1)==SUCCESS) {
                                                new_op_array = zend_compile_file(&file_handle, (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC);
                                                zend_destroy_file_handle(&file_handle TSRMLS_CC);
                                        } else {
@@ -2715,7 +2728,7 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY)
                                                zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename));
                                        }
                                }
-                               break;
+                               free(state.cwd);
                        }
                        break;
                case ZEND_INCLUDE:

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 46e1efb750124a7c628a5ec754f64388d4d40de3..301592f7293671a71855dd4681724979755418c1 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1897,16 +1897,29 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {
-                               int dummy = 1;
                                zend_file_handle file_handle;
+                               char cwd[MAXPATHLEN];
+                               cwd_state state;
 
-                               if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
+                               if (IS_ABSOLUTE_PATH(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename))) {
+                                       cwd[0] = '\0';
+                               } else if (!VCWD_GETCWD(cwd, MAXPATHLEN)) {
+                                       cwd[0] = '\0';
+                               }
+
+                               state.cwd_length = strlen(cwd);
+                               state.cwd = zend_strndup(cwd, state.cwd_length);
+
+                               if (!virtual_file_ex(&state, Z_STRVAL_P(inc_filename), NULL, 1) &&
+                                   zend_hash_exists(&EG(included_files), state.cwd, state.cwd_length+1)) {
+                                       failure_retval=1;
+                               } else if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
 
                                        if (!file_handle.opened_path) {
-                                               file_handle.opened_path = estrndup(inc_filename->value.str.val, inc_filename->value.str.len);
+                                               file_handle.opened_path = estrndup(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename));
                                        }
 
-                                       if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
+                                       if (zend_hash_add_empty_element(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1)==SUCCESS) {
                                                new_op_array = zend_compile_file(&file_handle, (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC);
                                                zend_destroy_file_handle(&file_handle TSRMLS_CC);
                                        } else {
@@ -1920,7 +1933,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename));
                                        }
                                }
-                               break;
+                               free(state.cwd);
                        }
                        break;
                case ZEND_INCLUDE:
@@ -4318,16 +4331,29 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {
-                               int dummy = 1;
                                zend_file_handle file_handle;
+                               char cwd[MAXPATHLEN];
+                               cwd_state state;
 
-                               if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
+                               if (IS_ABSOLUTE_PATH(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename))) {
+                                       cwd[0] = '\0';
+                               } else if (!VCWD_GETCWD(cwd, MAXPATHLEN)) {
+                                       cwd[0] = '\0';
+                               }
+
+                               state.cwd_length = strlen(cwd);
+                               state.cwd = zend_strndup(cwd, state.cwd_length);
+
+                               if (!virtual_file_ex(&state, Z_STRVAL_P(inc_filename), NULL, 1) &&
+                                   zend_hash_exists(&EG(included_files), state.cwd, state.cwd_length+1)) {
+                                       failure_retval=1;
+                               } else if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
 
                                        if (!file_handle.opened_path) {
-                                               file_handle.opened_path = estrndup(inc_filename->value.str.val, inc_filename->value.str.len);
+                                               file_handle.opened_path = estrndup(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename));
                                        }
 
-                                       if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
+                                       if (zend_hash_add_empty_element(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1)==SUCCESS) {
                                                new_op_array = zend_compile_file(&file_handle, (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC);
                                                zend_destroy_file_handle(&file_handle TSRMLS_CC);
                                        } else {
@@ -4341,7 +4367,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename));
                                        }
                                }
-                               break;
+                               free(state.cwd);
                        }
                        break;
                case ZEND_INCLUDE:
@@ -7321,16 +7347,29 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {
-                               int dummy = 1;
                                zend_file_handle file_handle;
+                               char cwd[MAXPATHLEN];
+                               cwd_state state;
 
-                               if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
+                               if (IS_ABSOLUTE_PATH(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename))) {
+                                       cwd[0] = '\0';
+                               } else if (!VCWD_GETCWD(cwd, MAXPATHLEN)) {
+                                       cwd[0] = '\0';
+                               }
+
+                               state.cwd_length = strlen(cwd);
+                               state.cwd = zend_strndup(cwd, state.cwd_length);
+
+                               if (!virtual_file_ex(&state, Z_STRVAL_P(inc_filename), NULL, 1) &&
+                                   zend_hash_exists(&EG(included_files), state.cwd, state.cwd_length+1)) {
+                                       failure_retval=1;
+                               } else if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
 
                                        if (!file_handle.opened_path) {
-                                               file_handle.opened_path = estrndup(inc_filename->value.str.val, inc_filename->value.str.len);
+                                               file_handle.opened_path = estrndup(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename));
                                        }
 
-                                       if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
+                                       if (zend_hash_add_empty_element(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1)==SUCCESS) {
                                                new_op_array = zend_compile_file(&file_handle, (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC);
                                                zend_destroy_file_handle(&file_handle TSRMLS_CC);
                                        } else {
@@ -7344,7 +7383,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename));
                                        }
                                }
-                               break;
+                               free(state.cwd);
                        }
                        break;
                case ZEND_INCLUDE:
@@ -19416,16 +19455,29 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {
-                               int dummy = 1;
                                zend_file_handle file_handle;
+                               char cwd[MAXPATHLEN];
+                               cwd_state state;
 
-                               if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
+                               if (IS_ABSOLUTE_PATH(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename))) {
+                                       cwd[0] = '\0';
+                               } else if (!VCWD_GETCWD(cwd, MAXPATHLEN)) {
+                                       cwd[0] = '\0';
+                               }
+
+                               state.cwd_length = strlen(cwd);
+                               state.cwd = zend_strndup(cwd, state.cwd_length);
+
+                               if (!virtual_file_ex(&state, Z_STRVAL_P(inc_filename), NULL, 1) &&
+                                   zend_hash_exists(&EG(included_files), state.cwd, state.cwd_length+1)) {
+                                       failure_retval=1;
+                               } else if (SUCCESS == zend_stream_open(Z_STRVAL_P(inc_filename), &file_handle TSRMLS_CC)) {
 
                                        if (!file_handle.opened_path) {
-                                               file_handle.opened_path = estrndup(inc_filename->value.str.val, inc_filename->value.str.len);
+                                               file_handle.opened_path = estrndup(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename));
                                        }
 
-                                       if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
+                                       if (zend_hash_add_empty_element(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1)==SUCCESS) {
                                                new_op_array = zend_compile_file(&file_handle, (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC);
                                                zend_destroy_file_handle(&file_handle TSRMLS_CC);
                                        } else {
@@ -19439,7 +19491,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename));
                                        }
                                }
-                               break;
+                               free(state.cwd);
                        }
                        break;
                case ZEND_INCLUDE: