Changeset 1815

Show
Ignore:
Timestamp:
08/14/08 14:26:44 (3 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r1814 r1815  
    112008-08-14  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * qa/conf.py, qa/run-tests.py: Fixes the TLS/SSL execution. 
    24 
    35        * cherokee/connection-protected.h, cherokee/thread.c, 

  • cherokee/trunk/qa/conf.py

    r1741 r1815  
    1 PORT = 1978 
    2 HOST = "localhost" 
     1PORT     = 1978 
     2PORT_TLS = 1979 
     3HOST     = "localhost" 
    34 
    45CHEROKEE_PATH     = "../cherokee/cherokee" 
    …… 
    1617PYTHON_PATH       = "auto" 
    1718PHPCGI_PATH       = "auto" 
    18 PHP_FCGI_PORT     = 1979 
     19PHP_FCGI_PORT     = 1980 
    1920 
    2021SSL_CERT_FILE     = "/etc/cherokee/ssl/cherokee.pem" 

  • cherokee/trunk/qa/run-tests.py

    r1764 r1815  
    134134# 
    135135server!port = %d  
     136server!port_tls = %s 
    136137server!keepalive = 1  
    137138server!listen = 127.0.0.1 
    …… 
    149150vserver!1!rule!1!match = default 
    150151vserver!1!rule!1!handler = common 
    151 """ % (PORT, panic, pid, CHEROKEE_MODS, CHEROKEE_DEPS, www) 
     152""" % (PORT, PORT_TLS, panic, pid, CHEROKEE_MODS, CHEROKEE_DEPS, www) 
    152153 
    153154PHP_FCGI = """\ 
    …… 
    184185vserver!1!ssl_certificate_file = %s 
    185186vserver!1!ssl_certificate_key_file = %s 
    186 vserver!1!ssl_cal_list_file = %s 
     187vserver!1!ssl_ca_list_file = %s 
    187188""" % (SSL_CERT_FILE, SSL_CERT_KEY_FILE, SSL_CA_FILE) 
    188189 
    …… 
    395396 
    396397if ssl: 
    397     port = 443 
     398    port = PORT_TLS 
    398399 
    399400# If we want to pause once do it before launching the threads