Commit Graph

143 Commits

Author SHA1 Message Date
734d6332aa CVE-2017-3167: add documentation to ap_get_basic_auth_pw()
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
2017-06-20 23:08:18 +00:00
92ab67cbad core: deprecate and replace ap_get_basic_auth_pw
*) 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
2017-05-26 21:29:59 +00:00
ef6e478b78 http: Allow unknown response status' lines returned in the form of:
HTTP/x.x xxx Status xxx



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1769760 13f79535-47bb-0310-9956-ffa450edef68
2016-11-15 09:06:55 +00:00
28163941ef New optional flag to enforce <CR><LF> line delimiters in ap_[r]getline,
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
2016-08-29 22:17:07 +00:00
c3a7812f63 Fix a small doxygen issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734716 13f79535-47bb-0310-9956-ffa450edef68
2016-03-12 16:51:56 +00:00
ded480d219 added AP_DECLARE for new ap_create_request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734231 13f79535-47bb-0310-9956-ffa450edef68
2016-03-09 12:39:04 +00:00
56a1aecacc core: Split ap_create_request() from ap_read_request()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734009 13f79535-47bb-0310-9956-ffa450edef68
2016-03-07 23:55:08 +00:00
b6a4217bad * include/http_protocol.h: Tweak wording.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732521 13f79535-47bb-0310-9956-ffa450edef68
2016-02-26 17:02:38 +00:00
5b5c48e657 first request on master connection only reports more preferred protocols in Upgrade header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1710583 13f79535-47bb-0310-9956-ffa450edef68
2015-10-26 12:15:43 +00:00
87b2c32276 announce protocol choices on first request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1710231 13f79535-47bb-0310-9956-ffa450edef68
2015-10-23 15:14:50 +00:00
18e2dd1225 new ap_is_allowed_protocol() for testing configured protocols, added H2Upgrade on/off directive, changed H2Direct default back to on when h2c is in Protocols
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1709587 13f79535-47bb-0310-9956-ffa450edef68
2015-10-20 13:42:23 +00:00
0491ab9ced improvements in ap_select_protocol(), supplied by yann ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1701178 13f79535-47bb-0310-9956-ffa450edef68
2015-09-04 08:52:15 +00:00
379f9d4d33 changed Protocols default to http/1.1 only, updated documentation, changed ap_select_protocol() to return NULL when no protocol could be agreed upon
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1701005 13f79535-47bb-0310-9956-ffa450edef68
2015-09-03 12:45:26 +00:00
c8fb805f65 Allowing protocol_propose hooks to be called with offers=NULL, clarifying semantics as proposed by chaosed0@gmail.com
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698116 13f79535-47bb-0310-9956-ffa450edef68
2015-08-27 11:18:21 +00:00
c0d80cc90c adding ap_get_protocol(c) which safeguards against NULL returns, for use instead of direct calling ap_run_protocol_get
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697855 13f79535-47bb-0310-9956-ffa450edef68
2015-08-26 08:58:45 +00:00
b9ba839d50 new Protocols directive and core API changes to enable protocol switching on HTTP Upgrade or ALPN, implemented in mod_ssl and mod_h2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1692486 13f79535-47bb-0310-9956-ffa450edef68
2015-07-24 12:09:44 +00:00
3f864213bc Correct typo in comments for ap_map_http_request_error().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529988 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 16:10:07 +00:00
1ce3115aab ap_rputs() silently truncated size_t to int, resulting in 130+ warnings
when building httpd and a rich set of modules on Windows. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529449 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 13:14:36 +00:00
9bc9d79079 core: Stop the HTTP_IN filter from attempting to write error buckets
to the output filters, which is bogus in the proxy case. Create a
clean mapping from APR codes to HTTP status codes, and use it where
needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482522 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 18:58:06 +00:00
6194962c46 core, mod_cache: Ensure RFC2616 compliance in ap_meets_conditions()
with weak validation combined with If-Range and Range headers. Break
out explicit conditional header checks to be useable elsewhere in the
server. Ensure weak validation RFC compliance in the byteranges filter.
Ensure RFC validation compliance when serving cached entities. PR 16142


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1479905 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 13:42:31 +00:00
ee1f762ec1 fix comment typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407526 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 16:29:43 +00:00
abafe1bd90 Typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1368396 13f79535-47bb-0310-9956-ffa450edef68
2012-08-02 09:17:34 +00:00
63ebd9031a bad header info: ap_rflush does not return the number of bytes flushed, it returns 0 on success, -1 on error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1368393 13f79535-47bb-0310-9956-ffa450edef68
2012-08-02 09:05:49 +00:00
75dad9d44f Rename ap_func_attr_* macros to AP_FN_ATTR_*
Add macro for attribute alloc_size on newer gcc's


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229134 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 13:06:18 +00:00
2aa21a62b1 Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly
excluded from this cleanup as they must be signature identical to the
clib functions, and although the definition of size_t has been flakey,
the definition of those functions appears to be generally clean since
ANSI C.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1228323 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 18:15:08 +00:00
1951a037bf More cleanup: Expand tabs and some more indentation fixes
No functional change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 18:08:42 +00:00
103f776c25 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:38:09 +00:00
5de00b4e54 typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166672 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 13:10:22 +00:00
c45e14b246 refactor to pull setting of Accept-Ranges header into http_protocol.c which
had been copied to other handlers.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166663 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 12:56:08 +00:00
1a2f66b358 Use APR_INLINE instead of inline, to support pre-C99 compilers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1140249 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 17:50:12 +00:00
20633f6349 Avoid "`sentinel' attribute directive ignored" warning with gcc 3.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1134906 13f79535-47bb-0310-9956-ffa450edef68
2011-06-12 10:40:17 +00:00
328e833e41 Add __attribute__((sentinel)) to a few functions that require a terminal NULL
argument.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1131467 13f79535-47bb-0310-9956-ffa450edef68
2011-06-04 19:00:16 +00:00
cdb37c5e4d Make ap_rputs an inline function, as it is mostly used with string constants
and this allows the compiler to optimize the strlen() call away.

Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1131465 13f79535-47bb-0310-9956-ffa450edef68
2011-06-04 18:50:55 +00:00
2aef21903c Cleanup... most don't need apr_hooks.h at all...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101067 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 15:36:32 +00:00
9175224482 New hook: ap_run_pre_read_request()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070616 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 19:21:37 +00:00
eedf130332 Introduce note_auth_failure hook to allow modules to add support
for additional auth types. This makes ap_note_auth_failure() work with
mod_auth_digest again.

PR: 48807


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@960399 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 21:16:53 +00:00
421ee8b008 Disabled DefaultType directive and removed ap_default_type()
from core.  We now exclude Content-Type from responses for which
a media type has not been configured via mime.types, AddType,
ForceType, or some other mechanism.  MMN major bump to NZ time.

PR: 13986



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@739382 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 19:12:51 +00:00
b613588a30 Move the KeptBodySize directive, kept_body filters and the
ap_parse_request_body function out of the http module and into a
new module called mod_request, reducing the size of the core.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@647263 13f79535-47bb-0310-9956-ffa450edef68
2008-04-11 18:41:53 +00:00
d5030b2190 Add a function to the http filters that is able to parse an HTML
form request with the type of application/x-www-form-urlencoded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@646281 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 11:39:58 +00:00
5e415009f3 Remove CORE_PRIVATE.
This define serves no modern purpose, since every module in the wild, including 
our own define it, for no purpose.

If you have functions which you do not want in the 'public' API, put them
in a private header, that is not installed, just like mod_ssl does.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645412 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 08:44:14 +00:00
97a2396b12 In hopes of replacing <Limit > with <Method > - choose another example
to point to for documenting these functions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645165 13f79535-47bb-0310-9956-ffa450edef68
2008-04-05 19:40:22 +00:00
c94140fb01 Add option not to send&clear response headers in ap_send_interim_response.
We'll need this option to fix PR#43711, and ap_send_interim_response
is fortunately too new an API to have made it into anything stable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@588806 13f79535-47bb-0310-9956-ffa450edef68
2007-10-26 23:56:06 +00:00
3d1465d445 Introduce ap_send_interim_response function and API, for interim
(HTTP 1xx) responses sent by an application or backend.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@582630 13f79535-47bb-0310-9956-ffa450edef68
2007-10-07 13:41:50 +00:00
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
8c1e315d3f Doxygen fixup / cleanup
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 23:03:59 +00:00
af9ae7c2d7 Remove ap_method_list_do and ap_method_list_vdo as previously mentioned dev@httpd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164536 13f79535-47bb-0310-9956-ffa450edef68
2005-04-25 05:19:18 +00:00
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 05:33:44 +00:00
c76dd4ecef veto and revert win64 patch: 64bit changes must percolate from the
bottom (APR/system) up -- we can't give the client a 64bit API and
then cast it to 32bits internally without introducing security holes
on other platforms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105572 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 22:39:53 +00:00