summaryrefslogtreecommitdiffstats
path: root/include (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Axe ap_rgetline_core(), not used anymore.Yann Ylavic2018-04-222-22/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829790 13f79535-47bb-0310-9956-ffa450edef68
* http: add ap_fgetline() and AP_GETLINE_NONBLOCK flag.Yann Ylavic2018-04-202-30/+41
| | | | | | | | | | | | | | | | 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
* core: Add and handle AP_GETLINE_NOSPC_EOL flag in ap_rgetline_core().Yann Ylavic2018-04-192-2/+5
| | | | | | | | | | | 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
* Guess at fixing win32 build regression on trunk introduced by r1734656William A. Rowe Jr2018-04-172-4/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829381 13f79535-47bb-0310-9956-ffa450edef68
* PR62199: add worker parameter ResponseFieldSize to mod_proxyEric Covener2018-04-111-1/+2
| | | | | | | | | | Submitted By: Hank Ibell Committed By: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1828926 13f79535-47bb-0310-9956-ffa450edef68
* Fix some typos reported in PR 59998Christophe Jaillet2018-03-244-6/+6
| | | | | | | | Most add already been fixed when PR 59990 had been applied on trunk. Thx klemens git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827669 13f79535-47bb-0310-9956-ffa450edef68
* Fix some doxygen commentChristophe Jaillet2018-03-221-4/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827529 13f79535-47bb-0310-9956-ffa450edef68
* Correctly identify origin of util_pcre.c/ap_regex.h as pcreposix[.ch]William A. Rowe Jr2018-02-211-1/+6
| | | | | | | | and correct LICENSE/NOTICE to match. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824973 13f79535-47bb-0310-9956-ffa450edef68
* mpm_event: follow up to r1823047 and r1824464.Yann Ylavic2018-02-201-1/+2
| | | | | | | | | MMN bump for CONN_STATE_NUM, plus don't consider CONN_STATE_LINGER_* as valid states returned process_connection (never have been). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824862 13f79535-47bb-0310-9956-ffa450edef68
* core: Create a conn_config_t structure to hold an extendable core config rather Graham Leggett2018-02-172-1/+7
| | | | | | | than consuming the whole pointer with the connection socket. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824635 13f79535-47bb-0310-9956-ffa450edef68
* Add MMN bump for AP_REG_DOLLAR_ENDONLY, ap_regcomp_get_default_cflagsGraham Leggett2018-02-161-1/+4
| | | | | | | ap_regcomp_set_default_cflags and ap_regcomp_default_cflag_by_name git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824470 13f79535-47bb-0310-9956-ffa450edef68
* mpm_event: follow up to r1823047: complete state validation after processing.Yann Ylavic2018-02-161-1/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824464 13f79535-47bb-0310-9956-ffa450edef68
* MMN bump for hostname_ex in proxy_worker_shared.Graham Leggett2018-02-161-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824457 13f79535-47bb-0310-9956-ffa450edef68
* regex: Allow to configure global/default options for regexes.Yann Ylavic2018-02-151-0/+22
| | | | | | | | | Like caseless matching or extended format, which may be useful as default behaviour the whole configuration. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824339 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy: follow up to r1667707: MMN minor bump.Yann Ylavic2018-02-151-1/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824332 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2018-02-012-2/+3
| | | | | | | | | adding AP_DECLARE for ap_parse_vhost_addrs() and minor bumb mmn. Resolves building mod_ssl on Windows. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1822872 13f79535-47bb-0310-9956-ffa450edef68
* Happy New Year 2018Rainer Jung2018-01-041-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820101 13f79535-47bb-0310-9956-ffa450edef68
* mmn bump for r1820098.Eric Covener2018-01-041-1/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820099 13f79535-47bb-0310-9956-ffa450edef68
* Add "AcceptErrorsNonFatal" directiveEric Covener2018-01-041-2/+16
| | | | | | | | | | | | | | This tweaks accept() failure processing by having ap_unixd_accept pass more errors up, and having the MPM's check against a macro to see if they are in a whitelist of non ENETDOWN/EMFILE kind of potential process-wide errors. Default behavior is still to exit. edit: MMN bump in 1820099. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820098 13f79535-47bb-0310-9956-ffa450edef68
* Post 2.5.0-alpha tag updatesDaniel Ruggeri2017-11-081-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1814549 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1812193: really change MMN major.Yann Ylavic2017-10-141-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812197 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1740928: including NOT_IN_PROXY in NOT_IN_DIR_LOC_FILE is bothYann Ylavic2017-10-142-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incomplete and not backportable, fix it by introducing NOT_IN_DIR_CONTEXT and restoring NOT_IN_DIR_LOC_FILE to its previous value. Per ap_check_cmd_context(), NOT_IN_DIR_LOC_FILE actually/really means "not in any directory context", while the definition itself does not include all the existing directory contexts (e.g. <Limit>, or <Proxy> before r1740928). This is a bit of a misnomer, at least, so instead of (ab)using it by adding the missing contexts (in an incompatible way), let's define NOT_IN_DIR_CONTEXT to really exclude all directory context (i.e. NOT_IN_DIR_LOC_FILE + NOT_IN_LIMIT + NOT_IN_PROXY) and use it wherever NOT_IN_DIR_LOC_FILE was used. This is by itself a major MMN bump (modules not compiled with this commit and having directives checked against NOT_IN_DIR_LOC_FILE won't be caught the same way by NOT_IN_DIR_CONTEXT in the new ap_check_cmd_context() code), but with the below change, 2.4.x should work as before: - if ((forbidden & NOT_IN_DIR_CONTEXT) == NOT_IN_DIR_CONTEXT) { + if ((forbidden & NOT_IN_DIR_LOC_FILE) == NOT_IN_DIR_LOC_FILE) { if (cmd->path != NULL) { return apr_pstrcat(cmd->pool, cmd->cmd->name, gt, - " cannot occur within directory context", NULL); + " cannot occur within <Directory/Location/Files/Proxy> " + "section", NULL); } ... } git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812193 13f79535-47bb-0310-9956-ffa450edef68
* ap_expr: open string expressions to the <word>.Yann Ylavic2017-10-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces the syntax "%{:<word>:}", borrowed from the <var>'s one, and which likewise can be embedded anywhere in a string expression (the same reserved character ':' gets reused in an unambiguous manner). This allows the two types of expressions (boolean and string) to now share fully the same language set, namely: strings, lists, vars, regexes, backrefs, functions with multiple or complex arguments, and especially combinations thereof. Most of them were reserved to boolean expressions only, while complex string constructions can also benefit to, well, strings. The <word> construct allows that (say the syntax "%{:<word>:}" looks like a temporary variable constructed in a string). Since string expressions may now have to deal with lists (arrays), they also need a way to produce/extract strings from list and vice versa. This can be done with the new "join" and "split" operators, while the new substitution regexes (like "s/<pattern>/<substitute>/<flags>") may be used to manipulate strings in place. All this of course available for both string and boolean expressions. Tests and doc updates upcoming.. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810605 13f79535-47bb-0310-9956-ffa450edef68
* config: follow up to r1809302.Yann Ylavic2017-09-221-1/+2
| | | | | | | Associate ap_get_module_flags() to MMN bump. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809314 13f79535-47bb-0310-9956-ffa450edef68
* config: follow up to r1809302.Yann Ylavic2017-09-221-9/+15
| | | | | | | | | Provide a convenient function to get module flags, and remove useless AP_MODULE_HAS_FLAGS checks in the core, core's version is at current MMN. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809311 13f79535-47bb-0310-9956-ffa450edef68
* config: follow up to r1809302.Yann Ylavic2017-09-221-2/+5
| | | | | | | | We need to check that the module itself is at the right version. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809305 13f79535-47bb-0310-9956-ffa450edef68
* config: allow to specify flags when registering modules.Yann Ylavic2017-09-222-1/+17
| | | | | | | | First one is AP_MODULE_FLAG_ALWAYS_MERGE. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809302 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-09-211-1/+1
| | | | | | | | mpm_common.h: guarding AP_ENABLE_EXCEPTION_HOOK against use when undefined so that -Wundef does not triggger. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809135 13f79535-47bb-0310-9956-ffa450edef68
* core, mpm_event: Add ap_update_sb_handle() to avoid a small memory leak ofYann Ylavic2017-07-212-1/+4
| | | | | | | | sizeof(ap_sb_handle_t) when re-entering event's process_socket(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802618 13f79535-47bb-0310-9956-ffa450edef68
* Make case insensitiveJim Jagielski2017-06-211-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799425 13f79535-47bb-0310-9956-ffa450edef68
* util.c: add a strict Base64 decoding functionJacob Champion2017-06-211-0/+22
| | | | | | | | | | | | | | | | ap_pbase64decode_strict() adds to the functionality of ap_pbase64decode() in two ways: - the length of the decoded buffer is returned, allowing embedded NULLs to be retained by the caller - the input string is strictly checked for Base64 validity, including correct zero-padding at the end of the string (This was originally added to the httpdunit feature/backport branch in r1796208, then reverted in r1799376, since it's currently intended for trunk only.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799380 13f79535-47bb-0310-9956-ffa450edef68
* CVE-2017-3167: add documentation to ap_get_basic_auth_pw()Jacob Champion2017-06-211-2/+9
| | | | | | | Now that we've released, add clarifying comments to the now-deprecated API. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799374 13f79535-47bb-0310-9956-ffa450edef68
* core: deprecate and replace ap_get_basic_auth_pwEric Covener2017-05-262-2/+27
| | | | | | | | | | | *) core: Deprecate ap_get_basic_auth_pw() and add ap_get_basic_auth_components(). Submitted By: Emmanuel Dreyfus <manu netbsd.org>, Jacob Champion, Eric Covener CVEID: CVE-2017-3167 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796348 13f79535-47bb-0310-9956-ffa450edef68
* Introduce request taint-checking concept.Nick Kew2017-04-212-1/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792169 13f79535-47bb-0310-9956-ffa450edef68
* * server/config.c, include/http_config.h (ap_build_cont_config,Joe Orton2017-03-091-2/+2
| | | | | | | | | | ap_soak_end_container): Constify directive arguments - existing callers pass string literals. * server/core.c (start_cond_section): Remove casts needed for above. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786120 13f79535-47bb-0310-9956-ffa450edef68
* Add <IfDirective> and <IfSection>:Joe Orton2017-03-092-1/+10
| | | | | | | | | | | | | | | | * server/core.c (test_ifdirective_section, test_ifsection_section): New callbacks. (core_cmds): Define new directives. * include/http_config.h, server/config.c (ap_exists_directive): New function. * include/ap_mmn.h: Bump MMN minor for above. * docs/manual/mod/core.xml: Add docs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786110 13f79535-47bb-0310-9956-ffa450edef68
* Revert r1783759: really more things than intended :pYann Ylavic2017-02-201-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783760 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1783755: update APLOGNO.Yann Ylavic2017-02-201-0/+4
| | | | | | [Reverted by r1783760] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783759 13f79535-47bb-0310-9956-ffa450edef68
* PR60647: ACC per connection not available w/ event MPMEric Covener2017-01-252-1/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780280 13f79535-47bb-0310-9956-ffa450edef68
* Move definition of ASCII_ZERO to httpd.h and rename it ZERO_ASCII for ↵Christophe Jaillet2017-01-061-0/+1
| | | | | | | | | | consistancy reason. Remove definition of ASCII_CRLF which is the same as CRLF_ASCII. Use ZERO_ASCII and CRLF_ASCII in mod_proxy_http git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777611 13f79535-47bb-0310-9956-ffa450edef68
* Happy New Year 2017Rainer Jung2017-01-021-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776956 13f79535-47bb-0310-9956-ffa450edef68
* ap_reclaim_child_processes(): Implement terminate immediatelyStefan Fritsch2016-11-211-2/+1
| | | | | | | | | | The behavior for terminate == 1 was documented but not implemented. Do that now. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1770750 13f79535-47bb-0310-9956-ffa450edef68
* http: Allow unknown response status' lines returned in the form of:Yann Ylavic2016-11-151-0/+11
| | | | | | | | HTTP/x.x xxx Status xxx git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1769760 13f79535-47bb-0310-9956-ffa450edef68
* When redrawing the parser, ap_get_http_token looked to be useful, but there'sWilliam A. Rowe Jr2016-10-182-14/+4
| | | | | | | | | | | | | | | | no application for this yet in httpd, so hold off adding this function when we backport the enhancements. ap_scan_http_token was entirely sufficient. If the community wants this new function, we can add it when backporting work is complete. This patch, and the earlier patches Friday actually demanded an mmn major bump due to struct member changes. In any final backport, new members must be added to the end of the struct to retain an mmn minor designation. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1765451 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1765115: MMN minor is now 3.Yann Ylavic2016-10-161-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1765126 13f79535-47bb-0310-9956-ffa450edef68
* Complete r1764961, missed .h updatesWilliam A. Rowe Jr2016-10-163-7/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1765115 13f79535-47bb-0310-9956-ffa450edef68
* Followup to r1764961:Rainer Jung2016-10-161-8/+0
| | | | | | | Remove declaration for dropped ap_has_cntrl(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1765114 13f79535-47bb-0310-9956-ffa450edef68
* Fix new declaration.Rainer Jung2016-10-161-1/+1
| | | | | | | Sorry for the noise. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1765113 13f79535-47bb-0310-9956-ffa450edef68
* Followup to r1764961:Rainer Jung2016-10-161-5/+3
| | | | | | | | - ap_scan_http_uri_safe() was removed - ap_scan_vchar_obstext() was introduced git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1765112 13f79535-47bb-0310-9956-ffa450edef68
* util_script.h: clarify ap_scan_script_header_* behaviorJacob Champion2016-09-121-16/+56
| | | | | | | | | The ap_scan_script_header_* functions were documented to be pass/fail, but they also have a third "state" that is returned when HTTP conditions (If-Modified-Since, etc.) aren't met. This has led to some recent bugs, so document it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1760404 13f79535-47bb-0310-9956-ffa450edef68