1. 24 Dec, 2011 1 commit
    • Kaspar Brand's avatar
      merge r1222917 from trunk: · aae8ec5f
      Kaspar Brand authored
      Set OPENSSL_NO_SSL_INTERN when compiling against OpenSSL 1.0.1
      or later, so that mod_ssl retains binary compatibility with future
      versions when internal structures are changed. Use API functions
      where available, and fall back to direct access for OpenSSL up
      to 1.0.0, where needed.
      
      Remove SSL_make_ciphersuite() from ssl_util_ssl.[ch], as it was
      never used by any released version of mod_ssl.
      
      
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1222920 13f79535-47bb-0310-9956-ffa450edef68
      aae8ec5f
  2. 23 Dec, 2011 1 commit
  3. 20 Dec, 2011 1 commit
  4. 19 Dec, 2011 1 commit
  5. 15 Dec, 2011 2 commits
  6. 12 Dec, 2011 2 commits
  7. 05 Dec, 2011 1 commit
  8. 02 Dec, 2011 1 commit
  9. 01 Dec, 2011 2 commits
  10. 30 Nov, 2011 3 commits
  11. 24 Nov, 2011 1 commit
  12. 23 Nov, 2011 1 commit
  13. 21 Nov, 2011 5 commits
  14. 19 Nov, 2011 1 commit
  15. 18 Nov, 2011 2 commits
  16. 13 Nov, 2011 1 commit
  17. 12 Nov, 2011 9 commits
  18. 11 Nov, 2011 2 commits
    • Rainer Jung's avatar
      Use the right lua scope when used as a hook. · 2b914f35
      Rainer Jung authored
      Backport of r1201042 from trunk.
      
      
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201046 13f79535-47bb-0310-9956-ffa450edef68
      2b914f35
    • Jim Jagielski's avatar
      Merge r1200475, r1200478, r1200482, r1200491, r1200513, r1200550, r1200580,... · fecd4102
      Jim Jagielski authored
      Merge r1200475, r1200478, r1200482, r1200491, r1200513, r1200550, r1200580, r1200605, r1200612, r1200614, r1200639, r1200646, r1200656, r1200667, r1200679, r1200699, r1200957, r1200961, r1200963 from trunk:
      
      fix issue with incorrect munging of the lua package path -- LuaPackagePath directives were not working
      
      Default to not allowing htaccess in /, instead of just the documentroot, which gets a nice 10% performance boost by default for me.
      
      * modules/ssl/ssl_private.h, modules/ssl/ssl_engine_kernel.c
        (ssl_callback_tlsext_tickets): Use unsigned char * to fix gcc
        -Wpointer-sign warnings.
      
      
      Only load the really imporant modules (i.e. those enabled by the 'few'
      selection) by default. Don't handle modules enabled with --enable-foo
      specially.
      
      This fixes problems with module dependencies until someone implements a
      mechanism for resolving module dependencies.
      
      
      remove last traces of the code cache
      
      * modules/proxy/mod_proxy_html.c (comp_urlmap): Fix const-ness warning.
      
      
      * modules/lua/mod_lua.c (ap_lua_ssl_is_https): New function.
        (lua_post_config): Pick up ssl_is_https optional function.
      
      * modules/lua/lua_request.c (req_ssl_is_https_field): New function.
        (ap_lua_load_request): Map is_https field to above.
      
      
      remove some debug logging which snuck in
      
      remove ability to set min and max pool sizes for server scope in prep for removing server scope
      
      remove lingering reslist references before killing server scope
      
      replace server scope with thread scope
      
      use a sub-pool for scope_once
      
      Fix installation of conf/extra/proxy-html.conf.
      
      Otherwise httpd does no longer start, because
      it is the only extra file required in the main
      config at the moment.
      
      
      Rebuild xdoc transform
      
      
      Clarify docs for LimitRequestLine, as per bug #51665.
      
      
      Rebuild doc transforms.
      
      Submitted by: brianm, pquerna, jorton, sf, brianm, jorton, jorton, sf, pquerna, brianm, brianm, brianm, brianm, brianm, jorton, rjung, rbowen, rbowen, rbowen
      Reviewed/backported by: jim
      
      
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200981 13f79535-47bb-0310-9956-ffa450edef68
      fecd4102
  19. 10 Nov, 2011 1 commit
  20. 09 Nov, 2011 2 commits