From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 25 Mar 2010 09:58:56 +0000 (+0000)
Subject: - add webapp config
X-Git-Tag: auto/ac/php-pecl-memcache-3_0_4-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp-pecl-memcache.git;a=commitdiff_plain;h=569ce73e351fa47cf337b4bde2f445ebe7440e2b

- add webapp config

Changed files:
    memcache-webapp.patch -> 1.1
---

diff --git a/memcache-webapp.patch b/memcache-webapp.patch
new file mode 100644
index 0000000..ddd042c
--- /dev/null
+++ b/memcache-webapp.patch
@@ -0,0 +1,28 @@
+--- php-pecl-memcache-3.0.4/memcache.php	2010-03-25 11:37:27.313562832 +0200
++++ php-pecl-memcache-3.0.4/memcache.php	2010-03-25 11:54:43.553667140 +0200
+@@ -19,21 +19,12 @@
+ 
+ $VERSION='$Id$';
+ 
+-define('ADMIN_USERNAME','memcache'); 	// Admin Username
+-define('ADMIN_PASSWORD','password');  	// Admin Password
+-define('DATE_FORMAT','Y/m/d H:i:s');
+-define('GRAPH_SIZE',200);
+-define('MAX_ITEM_DUMP',50);
+-
+-$MEMCACHE_SERVERS[] = 'mymemcache-server1:11211'; // add more as an array
+-$MEMCACHE_SERVERS[] = 'mymemcache-server2:11211'; // add more as an array
+-
+-
+-////////// END OF DEFAULT CONFIG AREA /////////////////////////////////////////////////////////////
++require_once '/etc/webapps/memcache/config.php';
+ 
+ ///////////////// Password protect ////////////////////////////////////////////////////////////////
+-if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW']) ||
+-           $_SERVER['PHP_AUTH_USER'] != ADMIN_USERNAME ||$_SERVER['PHP_AUTH_PW'] != ADMIN_PASSWORD) {
++if (!is_null(ADMIN_USERNAME) &&
++	(!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW']) ||
++           $_SERVER['PHP_AUTH_USER'] != ADMIN_USERNAME ||$_SERVER['PHP_AUTH_PW'] != ADMIN_PASSWORD)) {
+ 			Header("WWW-Authenticate: Basic realm=\"Memcache Login\"");
+ 			Header("HTTP/1.0 401 Unauthorized");
+