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, 30 insertions, 2 deletions

diff --git a/sca-cpp/trunk/patches/scribe.patch b/sca-cpp/trunk/patches/scribe-2.2.patch
index 6340c4634d..16c2e3871e 100644
--- a/sca-cpp/trunk/patches/scribe.patch
+++ b/sca-cpp/trunk/patches/scribe-2.2.patch
@@ -12,7 +12,7 @@
 
 --- src/file.cpp
 +++ src/file.cpp
-@@ -74,9 +74,21 @@ bool StdFile::openRead() {
+@@ -74,9 +74,21 @@
  }
  
  bool StdFile::openWrite() {
@@ -38,7 +38,7 @@
 
 --- src/scribe_server.cpp
 +++ src/scribe_server.cpp
-@@ -55,6 +55,8 @@ int main(int argc, char **argv) {
+@@ -55,6 +55,8 @@
      if (-1 == setrlimit(RLIMIT_NOFILE, &r_fd)) {
        LOG_OPER("setrlimit error (setting max fd size)");
      }
@@ -47,4 +47,32 @@
  
      int next_option;
      const char* const short_options = "hp:c:";
+@@ -110,7 +112,7 @@
+     }
+ 
+     TNonblockingServer server(processor, binaryProtocolFactory,
+-                              g_Handler->port, thread_manager);
++                              g_Handler->host, g_Handler->port, thread_manager);
+ 
+     LOG_OPER("Starting scribe server on port %lu", g_Handler->port);
+     fflush(stderr);
+@@ -583,6 +585,8 @@
+       throw runtime_error("No port number configured");
+     }
+ 
++    config.getString("host", host);
++
+     // check if config sets the size to use for the ThreadManager
+     unsigned long int num_threads;
+     if (config.getUnsigned("num_thrift_server_threads", num_threads)) {
 
+--- src/scribe_server.h
++++ src/scribe_server.h
+@@ -51,6 +51,7 @@
+   void setStatusDetails(const std::string& new_status_details);
+ 
+   unsigned long int port; // it's long because that's all I implemented in the conf class
++  std::string host;
+ 
+   // number of threads processing new Thrift connections
+   size_t numThriftServerThreads;