diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-07-16 06:48:21 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-07-16 06:48:21 +0000 |
commit | 6ab0d6faaa4f3b4cf2ca45f4c80436ce83423b9a (patch) | |
tree | 7764689e24f7df9f247f502bc0d60f858edb9fbf /sca-cpp/trunk/modules/http | |
parent | 574ccee478b9da9457cdf0e476b8df6eb584b580 (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/modules/http')
-rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-event-conf | 8 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-worker-conf | 8 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/http/proxy-ssl-conf | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-event-conf b/sca-cpp/trunk/modules/http/httpd-event-conf index a7cab03bc6..093bbe78d9 100755 --- a/sca-cpp/trunk/modules/http/httpd-event-conf +++ b/sca-cpp/trunk/modules/http/httpd-event-conf @@ -31,9 +31,15 @@ cat >$root/conf/mpm.conf <<EOF # Use HTTPD event MPM LoadModule mpm_event_module ${modules_prefix}/modules/mod_mpm_event.so -# Generated by: httpd-event-conf $* +EOF + +uname=`uname -s` +if [ $uname = "Darwin" ]; then + cat >>$root/conf/mpm.conf <<EOF +# Generated by: httpd-conf $* # Set thread stack size ThreadStackSize 2097152 EOF +fi diff --git a/sca-cpp/trunk/modules/http/httpd-worker-conf b/sca-cpp/trunk/modules/http/httpd-worker-conf index 84fe6b4a54..0a061dbffa 100755 --- a/sca-cpp/trunk/modules/http/httpd-worker-conf +++ b/sca-cpp/trunk/modules/http/httpd-worker-conf @@ -31,9 +31,15 @@ cat >$root/conf/mpm.conf <<EOF # Use HTTPD worker MPM LoadModule mpm_worker_module ${modules_prefix}/modules/mod_mpm_worker.so -# Generated by: httpd-event-conf $* +EOF + +uname=`uname -s` +if [ $uname = "Darwin" ]; then + cat >>$root/conf/mpm.conf <<EOF +# Generated by: httpd-conf $* # Set thread stack size ThreadStackSize 2097152 EOF +fi diff --git a/sca-cpp/trunk/modules/http/proxy-ssl-conf b/sca-cpp/trunk/modules/http/proxy-ssl-conf index 1d6ed9693a..ad7f26d83a 100755 --- a/sca-cpp/trunk/modules/http/proxy-ssl-conf +++ b/sca-cpp/trunk/modules/http/proxy-ssl-conf @@ -52,16 +52,16 @@ EOF cat >>$root/conf/svhost-ssl.conf <<EOF # Generated by: proxy-ssl-conf $* # Declare proxy SSL client certificates -SSLProxyCACertificateFile "$root/cert/ca.crt" -SSLProxyMachineCertificateFile "$root/cert/proxy.pem" +#SSLProxyCACertificateFile "$root/cert/ca.crt" +#SSLProxyMachineCertificateFile "$root/cert/proxy.pem" EOF cat >>$root/conf/dvhost-ssl.conf <<EOF # Generated by: proxy-ssl-conf $* # Declare proxy SSL client certificates -SSLProxyCACertificateFile "$root/cert/ca.crt" -SSLProxyMachineCertificateFile "$root/cert/proxy.pem" +#SSLProxyCACertificateFile "$root/cert/ca.crt" +#SSLProxyMachineCertificateFile "$root/cert/proxy.pem" EOF |