www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-14 01:22:37 +03:00
Code Activity
26,419 Commits 62 Branches 304 Tags
1755dc97033f4c7129f1f8c9380510517c7005a4
Commit Graph

8506 Commits

Author SHA1 Message Date
Kaspar Brand
6d5b99e95b update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553825 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-28 13:28:05 +00:00
Kaspar Brand
1e80b68ec1 Remove the hardcoded algorithm-type dependency for the SSLCertificateFile 
and SSLCertificateKeyFile directives, and deprecate SSLCertificateChainFile

Splitting the patch into smaller pieces turned out to be infeasible,
unfortunately, due to the heavily intertwined code in ssl_engine_config.c,
ssl_engine_init.c and ssl_engine_pphrase.c, which all depends on the
modssl_pk_server_t data structure. For better comprehensibility,
a detailed listing of the changes follows:

ssl_private.h
- drop the X509 certs and EVP_PKEY keys arrays from modssl_pk_server_t
- use apr_array_header_t for cert_files and key_files
- drop tPublicCert from SSLModConfigRec
- drop the ssl_algo_t struct and the SSL_ALGO_* and SSL_AIDX_* constants

ssl_engine_config.c
- change to apr_array_header_t for SSLCertificate[Key]File
- drop ssl_cmd_check_aidx_max, i.e. allow an arbitrary number of certs
  and keys (in theory; currently OpenSSL does not support more than
  one cert/key per algorithm type)
- add deprecation warning for SSLCertificateChainFile

ssl_engine_init.c
- configure server certs/keys in ssl_init_server_certs (no longer via
  ssl_pphrase_Handle in ssl_init_Module)
- in ssl_init_server_certs, read in certificates and keys with standard
  OpenSSL API functions (SSL_CTX_use_*_file), and only fall back to
  ssl_load_encrypted_pkey when encountering an encrypted private key
- drop ssl_server_import_cert, ssl_server_import_key, ssl_init_server_check,
  and ssl_init_ctx_cleanup_server
- move the "problematic re-initialization" check to ssl_init_server_ctx

ssl_engine_pphrase.c
- use servername:port:index as the key identifier, instead of the
  previously used servername:port:algorithm
- ssl_pphrase_Handle overhaul: remove all cert/public-key handling,
  make it only load a single (encrypted) private key, and rename
  to ssl_load_encrypted_pkey
- in the passphrase prompt message, show the private key file name
  instead of the vhost id and the algorithm name
- do no longer supply the algorithm name as an argument to "exec"-type
  passphrase prompting programs

ssl_util.c
- drop ssl_util_algotypeof, ssl_util_algotypestr, ssl_asn1_keystr,
  and ssl_asn1_table_keyfmt

ssl_util_ssl.{c,h}
- drop SSL_read_X509
- constify the filename arg for SSL_read_PrivateKey


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553824 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-28 13:24:17 +00:00
Vincent Deffontaines
f4d9c8df8c [trunk][doc] Introducing .fr translation for mod/mod_cgid.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553677 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-27 14:30:12 +00:00
Vincent Deffontaines
42b29df94e [trunk][doc] Introducing .fr translation for mod/mod_cern_meta.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553659 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-27 10:14:51 +00:00
Vincent Deffontaines
b77a033d42 [trunk][doc] Introducing .fr translation for mod/mod_cache_socache.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553655 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-27 10:00:12 +00:00
Vincent Deffontaines
0955a3dd92 [trunk][doc] .fr translation for r1553502 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553504 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 16:07:07 +00:00
Vincent Deffontaines
da5a4e7787 [trunk][doc] mod_dir.xml : Added missing details about DirectoryIndexRedirect 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553502 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 15:54:32 +00:00
André Malo
8014765ceb update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553493 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 15:07:38 +00:00
Vincent Deffontaines
e3aa416dcd [trunk][doc] Introducing .fr translation for mod/mod_authz_groupfile.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553489 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 14:47:44 +00:00
Vincent Deffontaines
1c70973b3c [trunk][doc] Introducing .fr translation for mod/mod_authz_dbm.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553488 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 14:37:57 +00:00
Eric Covener
6590c7c8ef emphasize that these directives only apply to authn 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553487 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 14:09:37 +00:00
Vincent Deffontaines
dd7c0668da [trunk][doc] mod/mod_authz_dbd.xml.fr - uptodate with r1553482 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553483 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 13:44:50 +00:00
Vincent Deffontaines
e1ee7ae38e [trunk][doc] mod/mod_authz_dbd.xml - Section title improvment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553482 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 13:39:32 +00:00
Vincent Deffontaines
e4e03fdc21 [trunk][doc] One more <p> for better readability 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553481 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 13:36:52 +00:00
Vincent Deffontaines
80ef5a5e12 [trunk][doc] Introducing .fr translation for mod/mod_authz_dbd.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553479 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 13:34:27 +00:00
Vincent Deffontaines
568821c6e3 [trunk][doc] Bringing .fr translation up to match r1553469 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553470 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 11:41:25 +00:00
Vincent Deffontaines
3198873ede [trunk][doc] mod/mod_authz_core : Re-ordering sections so the essential is stated first 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553469 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 11:36:40 +00:00
Vincent Deffontaines
8a823722bb [trunk][doc] Introducing .fr translation for mod/mod_authz_core.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553468 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 11:31:46 +00:00
Vincent Deffontaines
b594fa3b08 [trunk][doc] Introducing .fr translation for mod/mod_authn_socache.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553463 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-26 09:26:59 +00:00
Vincent Deffontaines
e2395c1eeb [trunk][doc] Introducing .fr translation for mod/mod_authn_dbm.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553405 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-25 18:06:23 +00:00
Vincent Deffontaines
91cd8c8394 [trunk][doc] Introducing .fr translation for mod/mod_authn_dbd.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553402 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-25 17:58:41 +00:00
Vincent Deffontaines
31fd58d321 [trunk][doc] Introducing .fr translation for mod/mod_authn_anon.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553401 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-25 17:44:43 +00:00
Vincent Deffontaines
ac93401aa8 [trunk][doc] Introducing french translation for mod/mod_allowmethods.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553400 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-25 17:36:11 +00:00
Vincent Deffontaines
ff1c40b600 [trunk][doc] Introducing french translatation for mod/directive-dict.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553399 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-25 17:28:17 +00:00
Vincent Deffontaines
3a32d9ab53 [trunk][doc] Introducing .fr translation for mod/directives.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553398 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-25 17:14:32 +00:00
Lucien Gentis
6304ea9e9a Update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550931 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-14 12:41:18 +00:00
Daniel Gruno
d7042247c0 s/password/pass/ 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550686 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-13 10:59:22 +00:00
Daniel Gruno
8249d9be06 Use a better example for a connection string (one with both username and password) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550682 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-13 10:48:09 +00:00
Lucien Gentis
fe746c4bb2 Update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1548918 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-07 14:48:08 +00:00
Eric Covener
d5174b9fcd If the "value" argument is prefixed with expr=, parse it with ap_expr 
rather than mod_headers' built-in format strings.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546801 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-01 11:23:22 +00:00
Lucien Gentis
fb0ce27209 Updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546747 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-30 16:48:28 +00:00
Takashi Sato
b4a5f63d20 update transformations 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546573 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-29 14:43:30 +00:00
Takashi Sato
2a49842c68 fix XML validation error on r1543907 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546568 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-29 14:23:49 +00:00
Takashi Sato
ba2c42c273 fix XML validation error on r1546534 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546567 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-29 14:21:34 +00:00
Eric Covener
2e6aaf6e21 compat note for AuthLDAPBindPassword exec: 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546534 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-29 10:55:49 +00:00
Gregg Lewis Smith
54c873474c List all APR dependencies 
PR 54739


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546438 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-28 18:29:46 +00:00
Eric Covener
9a1048ea9a drop a caveat with an outdated example, there is now "reallyall" documented above. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545015 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-24 17:32:00 +00:00
Lucien Gentis
b101b9a93e Updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1544822 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-23 15:59:20 +00:00
Eric Covener
54b748460f give a hint about the requirements for <If 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1544629 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-22 18:27:32 +00:00
Eric Covener
cbb160a5e8 include <if> in the list of things that are directory contexts before 
clicking through to the sections.html



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1544626 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-22 18:23:20 +00:00
Eric Covener
71b655f438 xforms 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1543908 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-20 19:04:48 +00:00
Eric Covener
228d28ac8f doc behavior change in r821333, CacheEnable foo / does not apply to forward 
proxy.  


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1543907 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-20 19:04:19 +00:00
Vincent Deffontaines
917e984b9a [trunk][doc] Introducing .fr translation for mod_auth_form.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542797 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-17 19:08:21 +00:00
Vincent Deffontaines
c6dca723bc [trunk][doc] Introducing .fr translation for relevant-standards.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542791 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-17 18:43:08 +00:00
Vincent Deffontaines
40d06cf1a1 [trunk][doc] Introducing .fr translation for socache.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542788 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-17 18:33:12 +00:00
Vincent Deffontaines
f03b735c21 [trunk][doc] Introducing .fr translation for getting-started.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542781 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-17 18:26:37 +00:00
Eric Covener
59294fb250 reword windows binaries text so it's clear that you may or may not see 
binaries for a given release.  Remove a "HTTPd" term that looked funny.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542752 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-17 16:10:02 +00:00
Lucien Gentis
ea49f2b8de Update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542522 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-16 15:08:22 +00:00
Vincent Deffontaines
11e5f75aaa Completing r1542515, where accents were not converted 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542516 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-16 14:45:37 +00:00
Vincent Deffontaines
19ed1b7610 [trunk][doc] Introducing .fr translation for compliance.xml 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542515 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-16 14:44:17 +00:00