Upgrade to HTTPD 2.4.2, APR 1.4.6, Memcached 1.4.13, Python 2.7.3, Ubuntu 12.04, and Mac OS X 10.7.4.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1361918 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/sca-cpp/trunk/components/cache/memcached-start b/sca-cpp/trunk/components/cache/memcached-start
index 5a71e7189f..ca6c4ac721 100755
--- a/sca-cpp/trunk/components/cache/memcached-start
+++ b/sca-cpp/trunk/components/cache/memcached-start
@@ -23,10 +23,10 @@ root=`echo "import os; print os.path.realpath('$1')" | python`
 
 addr=$2
 if [ "$addr" = "" ]; then
-    ip=""
+    host=""
     port="11211"
 else
-    ip=`$here/../../modules/http/httpd-addr ip $addr`
+    host=`$here/../../modules/http/httpd-addr ip $addr`
     port=`$here/../../modules/http/httpd-addr port $addr`
 fi
 
@@ -43,9 +43,9 @@ fi
 mkdir -p $root/memcached
 echo $log > $root/memcached/logger
 
-if [ "$ip" = "" ]; then
+if [ "$host" = "" ]; then
     nohup /bin/sh -c "($memcached_prefix/bin/memcached -d -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)" 1>/dev/null 2>/dev/null &
 else
-    nohup /bin/sh -c "($memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)" 1>/dev/null 2>/dev/null &
+    nohup /bin/sh -c "($memcached_prefix/bin/memcached -d -l $host -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)" 1>/dev/null 2>/dev/null &
 fi