Skip to content
GitLab
  1. 03 May, 2018 3 commits
    • Joe Orton's avatar
      mod_ssl: Add support for loading private keys from ENGINEs. Support · e71764a4
      Joe Orton authored 
      for PKCS#11 URIs only, and PIN entry is not threaded through
SSLPassPhraseDialog config yet.

* modules/ssl/ssl_util.c (modssl_is_engine_key): New function.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
  Use it, skip check for file existence for engine keys.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_pkey):
  New function.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs):
  For engine keys, load via modssl_load_engine_pkey.

Submitted by: Anderson Sasaki <ansasaki redhat.com>, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830819 13f79535-47bb-0310-9956-ffa450edef68
      e71764a4
    • Joe Orton's avatar
      * modules/ssl: Add some missing logno tags. · 85563cdd
      Joe Orton authored 
      
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830816 13f79535-47bb-0310-9956-ffa450edef68
      85563cdd
    • Yann Ylavic's avatar
      mod_slomem_shm: Handle a generation number when the slotmem size changes. · eb2c3f27
      Yann Ylavic authored 
      Modifying the number of proxy balancers or balancer members on restart
could have prevented the server to load, notably on Windows.  PR 62308.

The generation number integrated in the SHM filename allows to create a
new/resized SHM while the previous is still in use by previous generation
gracefully shutting down (Windows prevents SHM/file to be removed in this
case, but even on Unix(es) an unlinked file might not be re-openable while
an inode exists). The generation number is added/incremented only if the
size requirement changed, such that unrelated restarts continue to share
SHMs between generations.

The cleanup handling is also simplified because both the parent process and
the Windows child process need to cleanup everything on exit. This translates
to cleanup_slotmem() being always registered but in the dry load state
(AP_SQ_MS_CREATE_PRE_CONFIG), for both cases still.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830800 13f79535-47bb-0310-9956-ffa450edef68
      eb2c3f27
  3. 02 May, 2018 4 commits
  5. 30 Apr, 2018 2 commits
  7. 29 Apr, 2018 4 commits
  9. 28 Apr, 2018 5 commits
  11. 23 Apr, 2018 2 commits
  13. 22 Apr, 2018 3 commits
  15. 21 Apr, 2018 7 commits
  17. 20 Apr, 2018 7 commits
  19. 19 Apr, 2018 3 commits