summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Simplify the ssl_asn1_table API, remove abstraction (it is used onlyJoe Orton2018-05-043-45/+27
| | | | | | | | | | | | | | | | to cache serialized EVP_PKEYs not any char * blobs), and document. * modules/ssl/ssl_util.c (ssl_asn1_table_set): Take the EVP_PKEY and serialize internally. Use ap_realloc. Return the ssl_asn1_t * pointer. Don't call apr_hash_set() for unchanged pointer case. * modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey): Adjust for the above. * modules/ssl/ssl_private.h: Adjust as above, add docs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830927 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_util_ssl.c (modssl_read_privatekey): Remove unusedJoe Orton2018-05-043-9/+8
| | | | | | | | | | second argument. * modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey): Adjust accordingly. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830913 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_util_ssl.c, modules/ssl/ssl_util_ssl.h:Joe Orton2018-05-042-28/+0
| | | | | | | | Remove modssl_read_encrypted_pkey() and helpers, added in r1804087 but never used. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830912 13f79535-47bb-0310-9956-ffa450edef68
* Transforms.Joe Orton2018-05-042-20/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830880 13f79535-47bb-0310-9956-ffa450edef68
* Use <var> for variables in directive syntax everywhere forJoe Orton2018-05-041-10/+10
| | | | | | | consistency. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830879 13f79535-47bb-0310-9956-ffa450edef68
* Transforms.Joe Orton2018-05-035-8/+21
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830840 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey):Joe Orton2018-05-031-11/+6
| | | | | | | Simplify code, no functional change. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830836 13f79535-47bb-0310-9956-ffa450edef68
* mod_ssl: Add support for loading private keys from ENGINEs. SupportJoe Orton2018-05-038-10/+112
| | | | | | | | | | | | | | | | | | | | | 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
* * modules/ssl: Add some missing logno tags.Joe Orton2018-05-033-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830816 13f79535-47bb-0310-9956-ffa450edef68
* mod_slomem_shm: Handle a generation number when the slotmem size changes.Yann Ylavic2018-05-032-63/+99
| | | | | | | | | | | | | | | | | | | | | | | 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. [Reverted by r1831868] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830800 13f79535-47bb-0310-9956-ffa450edef68
* * build/config_vars.sh.in: Clean more variables from installed Joe Orton2018-05-021-0/+3
| | | | | | | config_vars.mk. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830754 13f79535-47bb-0310-9956-ffa450edef68
* * modules/md/config2.m4: Only export "md_module" symbolJoe Orton2018-05-021-1/+4
| | | | | | | for a DSO build. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830747 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy_html: Fix variable interpolation and memory allocation failure in ↵Yann Ylavic2018-05-022-0/+9
| | | | | | | | | | | ProxyHTMLURLMap. Proposed by: Ewald Dieterich <ewald mailbox.org> Reviewed by: ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830746 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1822537: replace static variable with pool userdata.Yann Ylavic2018-05-022-6/+12
| | | | | | | Also adds a comment and a CHANGES entry. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830744 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2018-04-302-1/+16
| | | | | | | | mod_http2: restoring the v1.10.16 keepalive timeout behavioud of mod_http2 (to be verified). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830562 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2018-04-303-3/+14
| | | | | | | | | mod_http2: adding an abort function to slave connections' pools, so out-of-memory events lead to a control process abort, as on HTTP/1.x connections. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830534 13f79535-47bb-0310-9956-ffa450edef68
* mod_xml2enc: follow up to r1829038 and r1829039.Yann Ylavic2018-04-301-10/+7
| | | | | | | | Use below pending_data logic for EOS bucket. This closes #48 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830523 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1828222: fix "defined but not used 'prot'" warning with libressl.Yann Ylavic2018-04-301-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830522 13f79535-47bb-0310-9956-ffa450edef68
* Add mod_socache_redis docsLuca Toscano2018-04-293-0/+167
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830490 13f79535-47bb-0310-9956-ffa450edef68
* documentation rebuildLuca Toscano2018-04-297-7/+64
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830489 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy_http2 docs: added section about HTTP/2 PUSH implementation and ↵Stefan Eissing2018-04-281-1/+14
| | | | | | alternatives. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830443 13f79535-47bb-0310-9956-ffa450edef68
* trivial tweakEric Covener2018-04-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830439 13f79535-47bb-0310-9956-ffa450edef68
* mod_http2 documentation: going a bit more into PUSH details and explaining ↵Stefan Eissing2018-04-281-0/+44
| | | | | | H2EarlyHints feature. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830428 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2018-04-283-2/+7
| | | | | | | | | | mod_http2: adding regular memory cleanup when transferring large response bodies. This reduces memory footprint and avoids memory exhaustion when transferring large files on 32-bit architectures. Fixes PR 62325. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830419 13f79535-47bb-0310-9956-ffa450edef68
* mod_log_json: fixing compilation errors in maintainer mode.Stefan Eissing2018-04-281-3/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830417 13f79535-47bb-0310-9956-ffa450edef68
* Add mod_log_jsonPaul Querna2018-04-233-1/+181
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829898 13f79535-47bb-0310-9956-ffa450edef68
* Move APACHE_CHECK_JANSSON m4 macro to general includes so additional modules ↵Paul Querna2018-04-232-108/+108
| | | | | | can use it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829895 13f79535-47bb-0310-9956-ffa450edef68
* Save a few cycles.Christophe Jaillet2018-04-221-3/+2
| | | | | | We already know the length of the string we want to copy, so use 'apr_pstrmemdup()' instead of 'apr_strdup()'. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829799 13f79535-47bb-0310-9956-ffa450edef68
* Axe ap_rgetline_core(), not used anymore.Yann Ylavic2018-04-225-42/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829790 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1829659, ap_[f]getline() EBCDIC awareness.Yann Ylavic2018-04-221-9/+24
| | | | | | | | | | | | Rename ap_fgetline_impl() to ap_fgetline_core(), and do missing EBCDIC translation in ap_fgetline(). Also restore EBCDIC translation for ap_getline(), as noted by Ruediger this was changed (unexpectedly) in r1829659. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829789 13f79535-47bb-0310-9956-ffa450edef68
* Rebuild.Lucien Gentis2018-04-2117-118/+92
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829725 13f79535-47bb-0310-9956-ffa450edef68
* XML updates.Lucien Gentis2018-04-217-102/+91
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829722 13f79535-47bb-0310-9956-ffa450edef68
* XML update.Lucien Gentis2018-04-211-3/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829720 13f79535-47bb-0310-9956-ffa450edef68
* rebuild with extraclean to pick up permalinks inEric Covener2018-04-21604-7067/+7301
| | | | | | | | This will make it easier to compare with an extraclean jdk9 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829716 13f79535-47bb-0310-9956-ffa450edef68
* xformsEric Covener2018-04-2127-115/+112
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829715 13f79535-47bb-0310-9956-ffa450edef68
* xforms for mod_filterEric Covener2018-04-211-41/+48
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829714 13f79535-47bb-0310-9956-ffa450edef68
* try to make the mod_filter docs a little more approachableEric Covener2018-04-211-28/+35
| | | | | | | | | | | | - more consistently refer to the filters declared via the harness as "smart filters" - reinforce that the providers are traditional filters. - drop some info about the optional type parameter - elaborate on examples git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829713 13f79535-47bb-0310-9956-ffa450edef68
* Improve highlight and make these doc much more readable.Christophe Jaillet2018-04-202-61/+56
| | | | | | Use the "c" highlight for API description. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829678 13f79535-47bb-0310-9956-ffa450edef68
* Delay some memory allocation.Christophe Jaillet2018-04-201-1/+2
| | | | | | If this handler will not handle the request, no need to waste bytes in the request pool. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829676 13f79535-47bb-0310-9956-ffa450edef68
* http: add ap_fgetline() and AP_GETLINE_NONBLOCK flag.Yann Ylavic2018-04-203-54/+92
| | | | | | | | | | | | | | | | It allows to read a line directly from an input filter, in blocking mode or not. Since no request_rec is needed, a pool may be given. Existing ap_[r]getline() function are now based off ap_fgetline() by calling: ap_fgetline(s, n, read, r->proto_input_filters, flags, bb, r->pool); Will follow up with a new ap_get_mime_headers_*() flavor which can be used by any filter that needs non-blocking and not necessarily has a request_rec (e.g. ap_http_filter() to read proxied response trailers). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829659 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy_http: follow up to r1829573: remain EBCDIC friendly.Yann Ylavic2018-04-201-1/+1
| | | | | | | | | Keep using ap_rgetline() as before r1829573, since ap_rgetline_core() is EBCDIC agnostic. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829657 13f79535-47bb-0310-9956-ffa450edef68
* core: forward flags to recursive/folding call to ap_rgetline_core().Yann Ylavic2018-04-201-2/+2
| | | | | | | | We still need them when folding, other than AP_GETLINE_FOLD itself of course. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829645 13f79535-47bb-0310-9956-ffa450edef68
* Restore comment about LimitRequestBody vs proxied responses.Yann Ylavic2018-04-201-2/+3
| | | | | | | | | ResponseFieldSize actually applies to headers (not body), so the comment was valid but did match the code (addressed by r1829642 still). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829643 13f79535-47bb-0310-9956-ffa450edef68
* http: LimitRequestBody applies to proxied requests.Yann Ylavic2018-04-202-4/+5
| | | | | | | | | | If f->r->proxyreq is PROXYREQ_PROXY or PROXYREQ_REVERSE in ap_http_filter(), we are still handling the request, not the response where LimitRequestBody does not apply. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829642 13f79535-47bb-0310-9956-ffa450edef68
* Fix some formating. (extra '.', missing <code>)Christophe Jaillet2018-04-194-6/+9
| | | | | | Fix the number of available load balancer scheduler algorithms and add a link to the corresponding module. (lbmethod_heartbeat was missing in the list) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829613 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy_http: make use of AP_GETLINE_NOSPC_EOL in ap_proxygetline().Yann Ylavic2018-04-192-41/+27
| | | | | | | | | | | Fixes response header thrown away after the previous one was considered too large and truncated. PR 62196. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829573 13f79535-47bb-0310-9956-ffa450edef68
* core: Add and handle AP_GETLINE_NOSPC_EOL flag in ap_rgetline_core().Yann Ylavic2018-04-194-25/+88
| | | | | | | | | | | This tells the ap_getline() family of functions to consume the end of line when the buffer is exhausted. PR 62198. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829557 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_engine_init.c (ssl_init_Module): Don't enable SSLJoe Orton2018-04-191-1/+2
| | | | | | | | | | for a vhost if SSLEnable is not used and no certs are configured, even if the Listen protocol is "https". Restores behaviour to that prior to r1809303 for configs which would now otherwise fail at startup. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829513 13f79535-47bb-0310-9956-ffa450edef68
* These tokens should not be emphasised.Christophe Jaillet2018-04-171-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829393 13f79535-47bb-0310-9956-ffa450edef68
* Explain when the surrounding double quotes arround the expr argument MUST be ↵Christophe Jaillet2018-04-171-2/+3
| | | | | | | | avoided. Fix an example to add these surrounding quotes to be consistent and in line with 2.4.x git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829390 13f79535-47bb-0310-9956-ffa450edef68
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-10 08:08:18 +0100