1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

29900 Commits

Author SHA1 Message Date
Jacob Champion
0dc9280e94 CVE-2017-9788: add unit tests for get_digest_rec()
Including the module source is a dirty hack, but maybe the direct way is
best for now. More functional tests are still TODO.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1801996 13f79535-47bb-0310-9956-ffa450edef68
2017-07-14 22:30:17 +00:00
Jacob Champion
63047d39ba ap_find_token: add unit tests
Add previously embargoed test case for CVE-2017-7668.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1799377 13f79535-47bb-0310-9956-ffa450edef68
2017-06-20 23:34:30 +00:00
Jacob Champion
f50be63ee1 Revert new base64 function and tests
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
2017-06-20 23:34:18 +00:00
Jacob Champion
6a1008ee10 util.c: add a strict Base64 decoding function
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
2017-05-25 21:18:42 +00:00
Jacob Champion
9d1dad18d8 httpdunit: clean up after ourselves properly
Remove the testcase stubs and object files on `make clean`.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796207 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:40 +00:00
Jacob Champion
ac87d1fbbd httpdunit: add CMake support for Windows
Add a CMake version of the httpdunit build system. At the moment, the only
annoyance is that CMake doesn't like globbing source files, so the
generator must be re-run whenever test cases are added.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796206 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:38 +00:00
Jacob Champion
589866e7e5 httpdunit: fix check.h on Windows
Check seems to have trouble with type definitions when using a
CMake+Windows toolchain. Include apr.h before check.h to ensure pid_t
exists.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796205 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:36 +00:00
Jacob Champion
ac43c82539 httpdunit: simplify test case generation
Look, a legitimate use of cat!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796204 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:35 +00:00
Jacob Champion
a4308d4c64 httpdunit_gen_cases: separate declarations from calls
This gets around strict compiler warnings.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796203 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:33 +00:00
Jacob Champion
d3289c73ee httpdunit: a Check-based unit test suite
Add a unit test suite based on Check:

    https://libcheck.github.io/check/

The suite depends on the build system to automatically generate the code
stubs that call every test case.

httpdunit is automatically enabled in the build if configure is able to
find Check via pkg-config. At the moment pkg-config is the only official
(non-deprecated) way to build and link against Check with an autoconf
system, since platforms may distribute Check as a static library.

Note that Check is an LGPL'd library, so we can't distribute test
objects and binaries. Building and running the suite remains optional
and is not required to run the server.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796202 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:32 +00:00
Jacob Champion
1b223229a1 configure: don't overwrite other_targets when mod_suexec is enabled
Just append to the list.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796201 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:30 +00:00
Jacob Champion
d8d6987036 rules.mk: output directly to target for LT_COMPILE
For source files that exist in another directory, libtool will by
default put the output file in the current working directory instead of
next to the source file. Our build logic would then `touch` an empty
output file in the place where the actual output should have gone.

Replace the touch logic with an explicit -o option to libtool.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796200 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:28 +00:00
Jacob Champion
3a84fd2a65 Feature branch for a C-based unit test suite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796198 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:12:49 +00:00
Luca Toscano
d00deff060 Core documentation update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796136 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 08:44:55 +00:00
Luca Toscano
a66bceda86 Remove warning about nested If/ElseIf/Else evaluation
As noted by Christophe Jaillet in the dev@ ml nested
if/elseif/else conditions are now evaluated. The code
change has been already backported to 2.4.x.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796135 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 08:44:09 +00:00
Jacob Champion
3ce596b1fb Merge in APR[-util] macros from branches/trunk-buildconf-noapr
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795931 13f79535-47bb-0310-9956-ffa450edef68
2017-05-23 16:28:46 +00:00
Jacob Champion
d7e1ad9390 buildconf: check in APR[-util] m4 macros
Suggestion by wrowe. These files haven't changed in years; since we need
them anyway, check them in directly. buildconf will still copy over the
latest versions during setup, and SVN will tell us if there are any
changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-buildconf-noapr@1795928 13f79535-47bb-0310-9956-ffa450edef68
2017-05-23 16:19:33 +00:00
Christophe Jaillet
2ba167652b Remove empty line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795834 13f79535-47bb-0310-9956-ffa450edef68
2017-05-22 17:54:59 +00:00
Jacob Champion
4b2a7701b1 ab: don't call malloc_init for OpenSSL 1.1.0
Patch by rjung.

The 1.1.0 compatibility macro for OpenSSL_malloc_init() causes problems
when mixed with procedure linkage stubs with some toolchains (e.g. GCC).
OpenSSL's malloc implementation doesn't recognize that the PLT stub
points back to it, which leads to infinite recursion.

Since the 1.1.0 documentation states that calling this function
explicitly is no longer necessary except "in certain shared-library
situations"(?), get rid of it.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795830 13f79535-47bb-0310-9956-ffa450edef68
2017-05-22 16:40:54 +00:00
Christophe Jaillet
be128ce47d Fix some style issues.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795652 13f79535-47bb-0310-9956-ffa450edef68
2017-05-20 05:11:44 +00:00
Christophe Jaillet
3ed6ed8c02 Add an explicit NULL to initialise a field in an authn_provider structure, as done in all other places. PR 60636
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795651 13f79535-47bb-0310-9956-ffa450edef68
2017-05-20 05:08:06 +00:00
Christophe Jaillet
182db5c2af When processing a 'SetEnv' directive, warn if the environment variable name includes a '='. It is likely a configuration error. PR 60249
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795635 13f79535-47bb-0310-9956-ffa450edef68
2017-05-19 20:51:51 +00:00
Daniel Ferradal
971329dee0 Added security_tips.xml.es and related files, included built html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795361 13f79535-47bb-0310-9956-ffa450edef68
2017-05-16 19:43:42 +00:00
William A. Rowe Jr
7316342839 Remove 3DES by default for users of older crypto librarys; the cipher
has been reclassified in current OpenSSL releases as WEAK due to 112
or fewer bits of remaining cipher strength, while the Sweet32 disclosure
extended the criticism of RC4 on to 3DES. (IDEA, which potentially has the
same issue, is never enabled by default in OpenSSL, due to patent concerns.)

This commit does not change default httpd behavior, but alters the suggested
behavior of newly provisioned httpd servers. Where adopted, XP with IE8 will
no longer handshake with mod_ssl (previously, XP with IE6 would not handshake.)
The same net effect occurs where OpenSSL is updated to 1.1.0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795358 13f79535-47bb-0310-9956-ffa450edef68
2017-05-16 19:33:36 +00:00
Eric Covener
f305c0ed07 backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794857 13f79535-47bb-0310-9956-ffa450edef68
2017-05-11 17:10:05 +00:00
Eric Covener
eb1d654ef5 remove recently backported items
(present in 2.4.x CHANGES)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794853 13f79535-47bb-0310-9956-ffa450edef68
2017-05-11 16:46:49 +00:00
Lucien Gentis
6a4f4536a0 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794215 13f79535-47bb-0310-9956-ffa450edef68
2017-05-07 15:49:48 +00:00
Lucien Gentis
75c95ac18e XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794214 13f79535-47bb-0310-9956-ffa450edef68
2017-05-07 15:48:50 +00:00
André Malo
08a050a14a update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794163 13f79535-47bb-0310-9956-ffa450edef68
2017-05-06 17:06:28 +00:00
André Malo
3ef9b07f13 property fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794161 13f79535-47bb-0310-9956-ffa450edef68
2017-05-06 16:56:09 +00:00
Lucien Gentis
3eba6c4f55 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794160 13f79535-47bb-0310-9956-ffa450edef68
2017-05-06 16:42:59 +00:00
Lucien Gentis
fcb4caf921 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794159 13f79535-47bb-0310-9956-ffa450edef68
2017-05-06 16:41:21 +00:00
Luca Toscano
f7bb5977af mod_remoteip doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794143 13f79535-47bb-0310-9956-ffa450edef68
2017-05-06 14:07:45 +00:00
Luca Toscano
1bf556e516 Remove unclear sentence in mod_remoteip doc
This sentence has been discussed in the docs@
mailing list since it wasn't super clear for
some people. I propose to just remove it,
the rest of the content is already clear in
my opinion.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794142 13f79535-47bb-0310-9956-ffa450edef68
2017-05-06 14:07:08 +00:00
Stefan Eissing
fd3f4b89e1 On the trunk:
update after mod_http2 backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794053 13f79535-47bb-0310-9956-ffa450edef68
2017-05-05 13:24:50 +00:00
Stefan Eissing
4a681f3c5d On the trunk:
mod_http2: fail requests without ERROR log in case we need to read interim
     responses and see only garbage. This can happen if proxied servers send
     data where none should be, e.g. a body for a HEAD request.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794049 13f79535-47bb-0310-9956-ffa450edef68
2017-05-05 13:03:41 +00:00
Luca Toscano
7d0a721a6c Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794046 13f79535-47bb-0310-9956-ffa450edef68
2017-05-05 12:53:05 +00:00
Luca Toscano
d24f113636 Add a note about time resolution to the timeout parameters - PR61067
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794044 13f79535-47bb-0310-9956-ffa450edef68
2017-05-05 12:52:00 +00:00
Jacob Champion
ec6d580ba1 docs: update
(Why wasn't mod_ssl.html.en updated during my last build...?)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793939 13f79535-47bb-0310-9956-ffa450edef68
2017-05-04 23:49:54 +00:00
Jacob Champion
f429387652 override index: update missing <override>s in directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793934 13f79535-47bb-0310-9956-ffa450edef68
2017-05-04 23:41:19 +00:00
Jacob Champion
1312f9a891 override index: remove invalid <override>s from directives
Remove the bogus "none" and "n/a" type <override>s from the
documentation. If a directive can't be put in .htaccess, it shouldn't
have an <override> element.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793933 13f79535-47bb-0310-9956-ffa450edef68
2017-05-04 23:41:16 +00:00
Jacob Champion
59033c23c0 merge in the override index
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793932 13f79535-47bb-0310-9956-ffa450edef68
2017-05-04 23:36:59 +00:00
Jacob Champion
1bfcf4a4c2 docs: update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793931 13f79535-47bb-0310-9956-ffa450edef68
2017-05-04 23:32:41 +00:00
Jacob Champion
e4238a4a49 override index: clarify this doc's purpose
Based on feedback by elukey.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793923 13f79535-47bb-0310-9956-ffa450edef68
2017-05-04 22:54:00 +00:00
Jacob Champion
3ec7888445 Add an Override Class Index
This page pulls in directives that declare an <override> element and
groups them by class. The documentation for each class comes from
overrides.xml. Any undocumented classes are flagged with a boilerplate
fallback text (this situation is only likely to occur with a misspelling
or otherwise invalid <override> somewhere else in the documentation).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793922 13f79535-47bb-0310-9956-ffa450edef68
2017-05-04 22:53:58 +00:00
Jacob Champion
95ca7eccba Feature branch for a new override index manual page.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793921 13f79535-47bb-0310-9956-ffa450edef68
2017-05-04 22:50:47 +00:00
Stefan Eissing
0df25d7d14 On the trunk:
mod_proxy_http2: update after backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793533 13f79535-47bb-0310-9956-ffa450edef68
2017-05-02 15:30:07 +00:00
Stefan Eissing
914d717530 On the trunk:
mod_proxy_http2: adding support for Reverse Proxy Request headers.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793525 13f79535-47bb-0310-9956-ffa450edef68
2017-05-02 15:16:43 +00:00
Christophe Jaillet
800af53861 Remove a space to synch with 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793314 13f79535-47bb-0310-9956-ffa450edef68
2017-05-01 11:58:37 +00:00
Christophe Jaillet
f2b05de137 Synch with 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793291 13f79535-47bb-0310-9956-ffa450edef68
2017-05-01 08:17:16 +00:00