Index: /trunk/xcache.c
===================================================================
--- /trunk/xcache.c (revision 546)
+++ /trunk/xcache.c (revision 547)
@@ -1956,9 +1956,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();
}
@@ -2009,5 +2011,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();
Index: /trunk/xcache.h
===================================================================
--- /trunk/xcache.h (revision 546)
+++ /trunk/xcache.h (revision 547)
@@ -6,4 +6,5 @@
#define XCACHE_COPYRIGHT "Copyright (c) 2005-2007"
#define XCACHE_URL "http://xcache.lighttpd.net"
+#define XCACHE_WIKI_URL XCACHE_URL "/wiki"
#include