diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-08-14 21:53:15 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-08-14 21:53:15 +0000 |
| commit | c7bac19b004d7796be38db919c777c1da2b1fcf1 (patch) | |
| tree | 392a2c487ae933ed697b21028f0bd89968472e42 /sca-cpp/trunk/components/cache | |
| parent | d6e80180e79f9f454a6e68caa81f0b24bdd8857d (diff) | |
Switch from the HTTPD prefork MPM to the multi-threaded event MPM where possible. Fix multi-threading issues in the SpiderMonkey integration.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1157676 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | sca-cpp/trunk/components/cache/Makefile.am | 3 | ||||
| -rwxr-xr-x | sca-cpp/trunk/components/cache/memcached-ssl-test | 1 | ||||
| -rwxr-xr-x | sca-cpp/trunk/components/cache/server-test | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/sca-cpp/trunk/components/cache/Makefile.am b/sca-cpp/trunk/components/cache/Makefile.am index b1ad26a246..159a941947 100644 --- a/sca-cpp/trunk/components/cache/Makefile.am +++ b/sca-cpp/trunk/components/cache/Makefile.am @@ -50,5 +50,4 @@ client_test_LDFLAGS = -lxml2 -lcurl -lmozjs dist_noinst_SCRIPTS = memcached-test memcached-ssl-test server-test noinst_PROGRAMS = memcache-test client-test -#TESTS = memcached-test memcached-ssl-test server-test -TESTS = memcached-test server-test +TESTS = memcached-test memcached-ssl-test server-test diff --git a/sca-cpp/trunk/components/cache/memcached-ssl-test b/sca-cpp/trunk/components/cache/memcached-ssl-test index a99a5a9144..ffd1cd0e8e 100755 --- a/sca-cpp/trunk/components/cache/memcached-ssl-test +++ b/sca-cpp/trunk/components/cache/memcached-ssl-test @@ -35,6 +35,7 @@ tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C tmp/tunnel ../../modules/http/httpd-start tmp/tunnel ../../modules/http/httpd-conf tmp/server localhost 8090 htdocs +../../modules/http/httpd-event-conf tmp/server tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C tmp/server -x ../../modules/http/httpd-ssl-conf tmp/server 8453 ../../modules/http/cert-auth-conf tmp/server diff --git a/sca-cpp/trunk/components/cache/server-test b/sca-cpp/trunk/components/cache/server-test index 1fea285100..d9176f37ac 100755 --- a/sca-cpp/trunk/components/cache/server-test +++ b/sca-cpp/trunk/components/cache/server-test @@ -19,6 +19,7 @@ # Setup ../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs +../../modules/http/httpd-event-conf tmp ../../modules/server/server-conf tmp ../../modules/server/scheme-conf tmp cat >>tmp/conf/httpd.conf <<EOF |