@@ -101,4 +101,8 @@
int orig_user_error_handler_error_reporting;
#endif
+
+#ifdef ZEND_COMPILE_IGNORE_INTERNAL_CLASSES
+ zend_uint orig_compiler_options;
+#endif
} xc_sandbox_t;
Index: /branches/1.3/xcache.c
===================================================================
--- /branches/1.3/xcache.c (revision 624)
+++ /branches/1.3/xcache.c (revision 625)
@@ -1,5 +1,5 @@
#if 0
-#define DEBUG
+#define XCACHE_DEBUG
#endif
@@ -23,4 +23,7 @@
#include "xcache.h"
+#ifdef ZEND_ENGINE_2_1
+#include "ext/date/php_date.h"
+#endif
#include "optimizer.h"
#include "coverager.h"
@@ -652,6 +655,11 @@
new_cest_ptrs[i] =
#endif
+#ifdef ZEND_COMPILE_DELAYED_BINDING
+ xc_install_class(xce->name.str.val, &ci->cest, -1,
+ UNISW(0, ci->type), ci->key, ci->key_size, ci->h TSRMLS_CC);
+#else
xc_install_class(xce->name.str.val, &ci->cest, ci->oplineno,
UNISW(0, ci->type), ci->key, ci->key_size, ci->h TSRMLS_CC);
+#endif
}
@@ -750,5 +758,5 @@
#define HASH(i) (i)
-#define HASH_USTR_L(t, s, l) HASH(zend_u_inline_hash_func(t, s, (l + 1) * sizeof(UChar)))
+#define HASH_ZSTR_L(t, s, l) HASH(zend_u_inline_hash_func(t, s, (l + 1) * sizeof(UChar)))
#define HASH_STR_L(s, l) HASH(zend_inline_hash_func(s, l + 1))
#define HASH_STR(s) HASH_STR_L(s, strlen(s) + 1)
@@ -766,5 +774,5 @@
static inline xc_hash_value_t xc_entry_hash_name(xc_entry_t *xce TSRMLS_DC) /* {{{ */
{
- return UNISW(NOTHING, UG(unicode) ? HASH_USTR_L(xce->name_type, xce->name.uni.val, xce->name.uni.len) :)
+ return UNISW(NOTHING, UG(unicode) ? HASH_ZSTR_L(xce->name_type, xce->name.uni.val, xce->name.uni.len) :)
HASH_STR_L(xce->name.str.val, xce->name.str.len);
}
@@ -893,4 +901,5 @@
}
/* }}} */
+#ifndef ZEND_COMPILE_DELAYED_BINDING
static void xc_cache_early_binding_class_cb(zend_op *opline, int oplineno, void *data TSRMLS_DC) /* {{{ */
{
@@ -920,4 +929,5 @@
}
/* }}} */
+#endif
static zend_op_array *xc_check_initial_compile_file(zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
{
@@ -938,5 +948,4 @@
char opened_path_buffer[MAXPATHLEN];
int old_constinfo_cnt, old_funcinfo_cnt, old_classinfo_cnt;
- int i;
if (!xc_initized) {
@@ -1180,8 +1189,12 @@
}
/* }}} */
+#ifndef ZEND_COMPILE_DELAYED_BINDING
/* {{{ find inherited classes that should be early-binding */
php.have_early_binding = 0;
- for (i = 0; i < php.classinfo_cnt; i ++) {
- php.classinfos[i].oplineno = -1;
+ {
+ int i;
+ for (i = 0; i < php.classinfo_cnt; i ++) {
+ php.classinfos[i].oplineno = -1;
+ }
}
@@ -1190,4 +1203,6 @@
xc_redo_pass_two(php.op_array TSRMLS_CC);
/* }}} */
+#endif
+
#ifdef SHOW_DPRINT
xc_dprint(&xce, 0 TSRMLS_CC);
@@ -1711,9 +1726,11 @@
if (admin_user == NULL || admin_pass == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "xcache.admin.user and xcache.admin.pass is required");
+ php_error_docref(XCACHE_WIKI_URL "/InstallAdministration" TSRMLS_CC, E_ERROR,
+ "xcache.admin.user and/or xcache.admin.pass settings is not configured."
+ " Make sure you've modified the correct php ini file for your php used in webserver.");
zend_bailout();
}
if (strlen(admin_pass) != 32) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "unexpect %lu bytes of xcache.admin.pass, expected 32 bytes, the password after md5()", (unsigned long) strlen(admin_pass));
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "xcache.admin.pass is %lu chars unexpectedly, it is supposed to be the password after md5() which should be 32 chars", (unsigned long) strlen(admin_pass));
zend_bailout();
}
@@ -1764,5 +1781,20 @@
sapi_add_header_ex(STR, sizeof(STR) - 1, 1, 1 TSRMLS_CC);
#undef STR
- ZEND_PUTS("XCache Auth Failed. User and Password is case sense\n");
+#define STR "Content-type: text/html; charset=UTF-8"
+ sapi_add_header_ex(STR, sizeof(STR) - 1, 1, 1 TSRMLS_CC);
+#undef STR
+ ZEND_PUTS("\n");
+ ZEND_PUTS("XCache Authentication Failed\n");
+ ZEND_PUTS("\n");
+ ZEND_PUTS("XCache Authentication Failed
\n");
+ ZEND_PUTS("You're not authorized to access this page due to wrong username and/or password you typed.
The following check points is suggested:
\n");
+ ZEND_PUTS("\n");
+ ZEND_PUTS("- Be aware that `Username' and `Password' is case sense. Check capslock status led on your keyboard, and punch left/right Shift keys once for each
\n");
+ ZEND_PUTS("- Make sure the md5 password is generated correctly. You may use mkpassword.php
\n");
+ ZEND_PUTS("- Reload browser cache by pressing F5 and/or Ctrl+F5, or simply clear browser cache after you've updated username/password in php ini.
\n");
+ ZEND_PUTS("
\n");
+ ZEND_PUTS("Check XCache wiki page for more information.\n");
+ ZEND_PUTS("\n");
+ ZEND_PUTS("\n");
zend_bailout();
@@ -2560,7 +2592,12 @@
php_info_print_table_row(2, "Modules Built", XCACHE_MODULES);
php_info_print_table_row(2, "Readonly Protection", xc_readonly_protection ? "enabled" : "N/A");
+#ifdef ZEND_ENGINE_2_1
ptr = php_format_date("Y-m-d H:i:s", sizeof("Y-m-d H:i:s") - 1, xc_init_time, 1 TSRMLS_CC);
php_info_print_table_row(2, "Cache Init Time", ptr);
efree(ptr);
+#else
+ snprintf(buf, sizeof(buf), "%lu", (long unsigned) xc_init_time);
+ php_info_print_table_row(2, "Cache Init Time", buf);
+#endif
#ifdef ZTS
@@ -2805,5 +2842,9 @@
xc_initized = 1;
xc_init_time = time(NULL);
+#ifdef PHP_WIN32
+ xc_init_instance_id = GetCurrentProcessId();
+#else
xc_init_instance_id = getpid();
+#endif
#ifdef ZTS
xc_init_instance_subid = tsrm_thread_id();
@@ -2979,5 +3020,5 @@
ext = (zend_extension *) zend_llist_get_last_ex(&zend_extensions, &lpos);
- assert(ext && ext != xc_llist_zend_extension);
+ assert(ext && ext != (zend_extension *) xc_llist_zend_extension->data);
xc_last_ext_startup = ext->startup;
ext->startup = xc_zend_startup_last;
Index: /branches/1.3/xcache.h
===================================================================
--- /branches/1.3/xcache.h (revision 624)
+++ /branches/1.3/xcache.h (revision 625)
@@ -6,4 +6,5 @@
#define XCACHE_COPYRIGHT "Copyright (c) 2005-2009"
#define XCACHE_URL "http://xcache.lighttpd.net"
+#define XCACHE_WIKI_URL XCACHE_URL "/wiki"
#include
@@ -39,5 +40,8 @@
#endif
-#ifdef ALLOCA_FLAG
+#ifdef do_alloca_with_limit
+# define my_do_alloca(size, use_heap) do_alloca_with_limit(size, use_heap)
+# define my_free_alloca(size, use_heap) free_alloca_with_limit(size, use_heap)
+#elif defined(ALLOCA_FLAG)
# define my_do_alloca(size, use_heap) do_alloca(size, use_heap)
# define my_free_alloca(size, use_heap) free_alloca(size, use_heap)
@@ -238,5 +242,7 @@
ulong h;
xc_cest_t cest;
+#ifndef ZEND_COMPILE_DELAYED_BINDING
int oplineno;
+#endif
} xc_classinfo_t;
/* }}} */
@@ -299,5 +305,7 @@
zend_uint classinfo_cnt;
xc_classinfo_t *classinfos;
+#ifndef ZEND_COMPILE_DELAYED_BINDING
zend_bool have_early_binding;
+#endif
#ifdef ZEND_ENGINE_2_1