summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Revert new base64 function and testsJacob Champion2017-06-201-22/+0
| | | | | | This should be trunk-only, not part of the backport branch. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1799376 13f79535-47bb-0310-9956-ffa450edef68
* util.c: add a strict Base64 decoding functionJacob Champion2017-05-251-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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796208 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-151-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-151-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-151-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
* http_config: follow up to r1702948: maybe unused, yet maybe usefull too.Yann Ylavic2016-09-061-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1759415 13f79535-47bb-0310-9956-ffa450edef68
* New optional flag to enforce <CR><LF> line delimiters in ap_[r]getline,William A. Rowe Jr2016-08-292-6/+14
| | | | | | | | | | | | | | created by overloading 'int fold' (1 or 0) as 'int flags', with the same value 1 for AP_GETLINE_FOLD (which httpd doesn't use), and a new value 2 for AP_GETLINE_CRLF Enforce CRLF when HttpProtocolOptions Strict is in force. Correctly introduces a new t/TEST fail. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758304 13f79535-47bb-0310-9956-ffa450edef68
* Dropped a public structure elt, bump majorWilliam A. Rowe Jr2016-08-291-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758227 13f79535-47bb-0310-9956-ffa450edef68
* Folding StrictWhitespace into the Strict ruleset of RFC7230, per dev@ poll.William A. Rowe Jr2016-08-291-5/+0
| | | | | | | | | | | This choice is unanimous, although StrictURI (a different RFC) still hasn't found absolute concensus. An ap_mmn bump will follow (major, this removes a struct elt) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758226 13f79535-47bb-0310-9956-ffa450edef68
* Rename LenientWhitespace to UnsafeWhitespace and change StrictWhitespaceWilliam A. Rowe Jr2016-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the default behavior, after discussion with fielding et al about the purpose of section 3.5. Update the documentation to clarify this. This patch removes whitespace considerations from the Strict|Unsafe toggle and consolidates them all in the StrictWhitespace|UnsafeWhitespace toggle. Added a bunch of logic comments to read_request_line parsing. Dropped the badwhitespace list for an all-or-nothing toggle in rrl. Leading space before the method is optimized to be evaluated only once. Toggled the request from HTTP/0.9 to HTTP/1.0 for more BAD_REQUEST cases. Moved s/[\n\v\f\r]/ / cleanup logic earlier in the cycle, to operate on each individual line read, and catch bad whitespace errors earlier. This changes the obs-fold to more efficiently condense whitespace and forces concatinatination with a single SP, always. Overrides are not necessary since obs-fold is clearly deprecated. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757589 13f79535-47bb-0310-9956-ffa450edef68
* ap_reclaim_child_processes() ignores its first argumentStefan Fritsch2016-08-211-1/+2
| | | | | | | note this in the docs, add comment git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757061 13f79535-47bb-0310-9956-ffa450edef68
* Introduce StrictURI|UnsafeURI for RFC3986 enforcementWilliam A. Rowe Jr2016-08-192-0/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756959 13f79535-47bb-0310-9956-ffa450edef68
* Perform correct, strict parsing of the request line, handling theWilliam A. Rowe Jr2016-08-182-2/+14
| | | | | | | | | | | | | | | | | | | | http protocol tag, url and method appropriately, and attempting to extract values even in the presence of unusual whitespace in keeping with section 3.5, prior to responding with whatever error reply is needed. Conforms to RFC7230 in all respects, the section 3.5 optional behavior can be disabled by the user with a new HttpProtocolOptions StrictWhitespace flag. In all cases, the_request is regenerated from the parsed components with exactly two space characters. Shift sf's 'strict' method check from the Strict behavior because it violates forward proxy logic, adding a new RegisteredMethods flag, as it will certainly be useful to some. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756729 13f79535-47bb-0310-9956-ffa450edef68
* Correct AP_HTTP_CONFORMANCE_ flags with an ap_mmn.h bumpWilliam A. Rowe Jr2016-08-162-3/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756555 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1750392: r1756186 should have also bumped MMN minor forYann Ylavic2016-08-141-1/+1
| | | | | | s/ap_proxy_check_backend/ap_proxy_check_connection/, and r1756328 really bump the MMN :p git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756329 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1750392: r1756186 should have also bumped MMN minor forYann Ylavic2016-08-141-1/+3
| | | | | | s/ap_proxy_check_backend/ap_proxy_check_connection/. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756328 13f79535-47bb-0310-9956-ffa450edef68
* [mod_proxy_]http: follow up to r1750392.Yann Ylavic2016-08-122-3/+19
| | | | | | | | | Export [ap_]check_pipeline() and use it also for ap_proxy_check_connection(), so that all the necessary checks on the connection are done before reusing it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756186 13f79535-47bb-0310-9956-ffa450edef68
* Revert r1756064 and r1756060 until fixed (tests framework passes).Yann Ylavic2016-08-112-19/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756065 13f79535-47bb-0310-9956-ffa450edef68
* [mod_proxy_]http: follow up to r1750392.Yann Ylavic2016-08-112-3/+19
| | | | | | | | | Export [ap_]check_pipeline() and use it also for ap_proxy_check_connection(). [Reverted by r1756065] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756060 13f79535-47bb-0310-9956-ffa450edef68
* Fix spelling in comments and text files.Rainer Jung2016-08-115-7/+7
| | | | | | | | No functional change. PR 59990 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756038 13f79535-47bb-0310-9956-ffa450edef68
* We didn't change the MODULE_MAGIC_NUMBER_MAJORJim Jagielski2016-08-051-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1755325 13f79535-47bb-0310-9956-ffa450edef68
* Introduce ap_scan_http_field_content, ap_scan_http_tokenWilliam A. Rowe Jr2016-07-292-1/+28
| | | | | | | | and ap_get_http_token for more efficient string handling. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1754541 13f79535-47bb-0310-9956-ffa450edef68
* A whole lotta nope, if you implement HTCPCP then register your methods in initWilliam A. Rowe Jr2016-07-181-3/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1753263 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy_{http,ajp,fcgi}}: don't reuse backend connections with data availableYann Ylavic2016-06-271-1/+3
| | | | | | | | | | | | | before the request is sent. PR 57832. ap_proxy_check_backend() can be used before ap_proxy_connect_backend() to try to read available data (including from the filters), and is called by ap_proxy_connect_backend() to check the socket state only (as before, still relevant after ap_proxy_check_backend() due to filter data which may not have triggered a real socket operation). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750392 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy: revert r1750301, r1750305 and r1750311.Yann Ylavic2016-06-271-2/+1
| | | | | | Rework needed. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750376 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy: follow up to r1750301.Yann Ylavic2016-06-271-1/+2
| | | | | | | | | | s/is_socket_connected/get_socket_connected/ in the !USE_ALTERNATE_IS_CONNECTED case, and add CHANGE + MMN entries. [Reverted by r1750376] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750305 13f79535-47bb-0310-9956-ffa450edef68
* Allow other modules to become providers and add ACLsGraham Leggett2016-06-131-1/+3
| | | | | | | to the DAV response. Requires apr-util v1.6+. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1748322 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Add dav_begin_multistatus, dav_send_one_response,Graham Leggett2016-06-121-1/+5
| | | | | | | | dav_finish_multistatus, dav_send_multistatus, dav_handle_err, dav_failed_proppatch, dav_success_proppatch to mod_dav.h. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1748047 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Add dav_get_provider_name() function to obtain the nameGraham Leggett2016-06-121-1/+2
| | | | | | | of the provider from mod_dav. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1747946 13f79535-47bb-0310-9956-ffa450edef68
* A much more innocuous cut-and-paste flawWilliam A. Rowe Jr2016-06-091-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1747484 13f79535-47bb-0310-9956-ffa450edef68
* Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n](), update with APR doxygenWilliam A. Rowe Jr2016-06-091-13/+22
| | | | | | | This time, with merge-ability back into 2.4.x git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1747478 13f79535-47bb-0310-9956-ffa450edef68
* Major issue with these two specific edits falling into r1747469William A. Rowe Jr2016-06-091-22/+13
| | | | | | | | | | is that it becomes impossible to cleanly merge into branches/2.4.x. Reverting this one functional/historical edit, to recommit for merging. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1747477 13f79535-47bb-0310-9956-ffa450edef68
* Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n](), update with APR doxygenWilliam A. Rowe Jr2016-06-092-15/+25
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1747469 13f79535-47bb-0310-9956-ffa450edef68
* mod_dav: Add support for childtags to dav_error.Graham Leggett2016-05-301-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1746207 13f79535-47bb-0310-9956-ffa450edef68
* Off by one "make dox" warningChristophe Jaillet2016-05-301-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1746206 13f79535-47bb-0310-9956-ffa450edef68
* Fix some doxygen warning.Christophe Jaillet2016-05-301-4/+1
| | | | | | Make the use of 'pfds' and 'pds' consistent git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1746189 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status