summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/patches
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-07-16 06:48:21 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-07-16 06:48:21 +0000
commit6ab0d6faaa4f3b4cf2ca45f4c80436ce83423b9a (patch)
tree7764689e24f7df9f247f502bc0d60f858edb9fbf /sca-cpp/trunk/patches
parent574ccee478b9da9457cdf0e476b8df6eb584b580 (diff)
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
Diffstat (limited to 'sca-cpp/trunk/patches')
-rw-r--r--sca-cpp/trunk/patches/apr-util-1.4.1.patch (renamed from sca-cpp/trunk/patches/apr-1.4.x.patch)0
-rw-r--r--sca-cpp/trunk/patches/memcached-1.4.7.patch12
-rw-r--r--sca-cpp/trunk/patches/scribe-2.2.patch (renamed from sca-cpp/trunk/patches/scribe.patch)32
-rw-r--r--sca-cpp/trunk/patches/thrift-0.2.0.patch39
4 files changed, 69 insertions, 14 deletions
diff --git a/sca-cpp/trunk/patches/apr-1.4.x.patch b/sca-cpp/trunk/patches/apr-util-1.4.1.patch
index 2b88d3575f..2b88d3575f 100644
--- a/sca-cpp/trunk/patches/apr-1.4.x.patch
+++ b/sca-cpp/trunk/patches/apr-util-1.4.1.patch
diff --git a/sca-cpp/trunk/patches/memcached-1.4.7.patch b/sca-cpp/trunk/patches/memcached-1.4.7.patch
deleted file mode 100644
index f34d75753e..0000000000
--- a/sca-cpp/trunk/patches/memcached-1.4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -247,7 +247,7 @@ AC_CACHE_CHECK([for libevent directory], ac_cv_libevent_dir, [
- AS_IF(test "$SUNCC" = "yes" -o "x$_myos" = "xsolaris2",
- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"],
- [AS_IF(test "$GCC" = "yes",
-- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath=$ledir/lib"])])
-+ [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath,$ledir/lib"])])
- else
- ac_cv_libevent_dir="(system)"
- fi
-
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;
diff --git a/sca-cpp/trunk/patches/thrift-0.2.0.patch b/sca-cpp/trunk/patches/thrift-0.2.0.patch
new file mode 100644
index 0000000000..a834faca02
--- /dev/null
+++ b/sca-cpp/trunk/patches/thrift-0.2.0.patch
@@ -0,0 +1,39 @@
+--- lib/cpp/src/server/TNonblockingServer.cpp
++++ lib/cpp/src/server/TNonblockingServer.cpp
+@@ -622,8 +622,8 @@
+ hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+ sprintf(port, "%d", port_);
+
+- // Wildcard address
+- error = getaddrinfo(NULL, port, &hints, &res0);
++ // Wildcard or specified address
++ error = getaddrinfo(host_ == "" || host_ =="*"? NULL : host_.c_str(), port, &hints, &res0);
+ if (error) {
+ string errStr = "TNonblockingServer::serve() getaddrinfo " + string(gai_strerror(error));
+ GlobalOutput(errStr.c_str());
+
+--- lib/cpp/src/server/TNonblockingServer.h
++++ lib/cpp/src/server/TNonblockingServer.h
+@@ -65,6 +65,9 @@
+ // Server socket file descriptor
+ int serverSocket_;
+
++ // Host server runs on
++ std::string host_;
++
+ // Port server runs on
+ int port_;
+
+@@ -117,10 +120,12 @@
+
+ TNonblockingServer(boost::shared_ptr<TProcessor> processor,
+ boost::shared_ptr<TProtocolFactory> protocolFactory,
++ std::string host,
+ int port,
+ boost::shared_ptr<ThreadManager> threadManager = boost::shared_ptr<ThreadManager>()) :
+ TServer(processor),
+ serverSocket_(-1),
++ host_(host),
+ port_(port),
+ threadManager_(threadManager),
+ eventBase_(NULL),