summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CVE-2017-9788: add unit tests for get_digest_rec()httpdunitJacob Champion2017-07-141-0/+107
| | | | | | | 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
* ap_find_token: add unit testsJacob Champion2017-06-201-0/+88
| | | | | | 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
* Revert new base64 function and testsJacob Champion2017-06-203-267/+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-253-0/+267
| | | | | | | | | | | | 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
* httpdunit: clean up after ourselves properlyJacob Champion2017-05-251-1/+2
| | | | | | 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
* httpdunit: add CMake support for WindowsJacob Champion2017-05-251-0/+67
| | | | | | | | 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
* httpdunit: fix check.h on WindowsJacob Champion2017-05-252-0/+2
| | | | | | | | 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
* httpdunit: simplify test case generationJacob Champion2017-05-251-6/+2
| | | | | | 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
* httpdunit_gen_cases: separate declarations from callsJacob Champion2017-05-252-3/+17
| | | | | | 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
* httpdunit: a Check-based unit test suiteJacob Champion2017-05-256-1/+251
| | | | | | | | | | | | | | | | | | | | 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
* configure: don't overwrite other_targets when mod_suexec is enabledJacob Champion2017-05-251-1/+1
| | | | | | Just append to the list. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796201 13f79535-47bb-0310-9956-ffa450edef68
* rules.mk: output directly to target for LT_COMPILEJacob Champion2017-05-251-2/+2
| | | | | | | | | | | 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
* Feature branch for a C-based unit test suite.Jacob Champion2017-05-250-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796198 13f79535-47bb-0310-9956-ffa450edef68
* Core documentation updateLuca Toscano2017-05-251-8/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796136 13f79535-47bb-0310-9956-ffa450edef68
* Remove warning about nested If/ElseIf/Else evaluationLuca Toscano2017-05-251-8/+3
| | | | | | | | | | 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
* Merge in APR[-util] macros from branches/trunk-buildconf-noaprJacob Champion2017-05-233-0/+1403
|\ | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795931 13f79535-47bb-0310-9956-ffa450edef68
| * buildconf: check in APR[-util] m4 macrostrunk-buildconf-noaprJacob Champion2017-05-233-0/+1403
| | | | | | | | | | | | | | | | | | | | 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
* | Remove empty line.Christophe Jaillet2017-05-221-1/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795834 13f79535-47bb-0310-9956-ffa450edef68
* | ab: don't call malloc_init for OpenSSL 1.1.0Jacob Champion2017-05-221-2/+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
* | Fix some style issues.Christophe Jaillet2017-05-201-7/+11
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795652 13f79535-47bb-0310-9956-ffa450edef68
* | Add an explicit NULL to initialise a field in an authn_provider structure, ↵Christophe Jaillet2017-05-201-0/+1
| | | | | | | | | | | | 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
* | When processing a 'SetEnv' directive, warn if the environment variable name ↵Christophe Jaillet2017-05-193-1/+16
| | | | | | | | | | | | 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
* | Added security_tips.xml.es and related files, included built html.esDaniel Ferradal2017-05-164-0/+635
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795361 13f79535-47bb-0310-9956-ffa450edef68
* | Remove 3DES by default for users of older crypto librarys; the cipherWilliam A. Rowe Jr2017-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | backportedEric Covener2017-05-111-3/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794857 13f79535-47bb-0310-9956-ffa450edef68
* | remove recently backported itemsEric Covener2017-05-111-14/+0
| | | | | | | | | | | | | | | | (present in 2.4.x CHANGES) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794853 13f79535-47bb-0310-9956-ffa450edef68
* | Rebuild.Lucien Gentis2017-05-0730-58/+66
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794215 13f79535-47bb-0310-9956-ffa450edef68
* | XML updates.Lucien Gentis2017-05-0711-356/+375
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794214 13f79535-47bb-0310-9956-ffa450edef68
* | update transformationAndré Malo2017-05-0635-1226/+1293
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794163 13f79535-47bb-0310-9956-ffa450edef68
* | property fixesAndré Malo2017-05-062-268/+268
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794161 13f79535-47bb-0310-9956-ffa450edef68
* | Rebuild.Lucien Gentis2017-05-0660-60/+107
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794160 13f79535-47bb-0310-9956-ffa450edef68
* | XML updates.Lucien Gentis2017-05-0611-45/+58
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794159 13f79535-47bb-0310-9956-ffa450edef68
* | mod_remoteip doc rebuildLuca Toscano2017-05-061-2/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794143 13f79535-47bb-0310-9956-ffa450edef68
* | Remove unclear sentence in mod_remoteip docLuca Toscano2017-05-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | On the trunk:Stefan Eissing2017-05-052-6/+2
| | | | | | | | | | | | | | | | update after mod_http2 backport git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794053 13f79535-47bb-0310-9956-ffa450edef68
* | On the trunk:Stefan Eissing2017-05-052-1/+12
| | | | | | | | | | | | | | | | | | | | 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
* | Documentation rebuildLuca Toscano2017-05-051-2/+11
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794046 13f79535-47bb-0310-9956-ffa450edef68
* | Add a note about time resolution to the timeout parameters - PR61067Luca Toscano2017-05-051-2/+6
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794044 13f79535-47bb-0310-9956-ffa450edef68
* | docs: updateJacob Champion2017-05-0489-118/+1056
| | | | | | | | | | | | (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
* | override index: update missing <override>s in directivesJacob Champion2017-05-0421-0/+61
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793934 13f79535-47bb-0310-9956-ffa450edef68
* | override index: remove invalid <override>s from directivesJacob Champion2017-05-043-19/+0
| | | | | | | | | | | | | | | | 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
* | merge in the override indexJacob Champion2017-05-048-6/+416
|\ \ | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793932 13f79535-47bb-0310-9956-ffa450edef68
| * | override index: clarify this doc's purposetrunk-override-indexJacob Champion2017-05-041-2/+9
| | | | | | | | | | | | | | | | | | 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
| * | Add an Override Class IndexJacob Champion2017-05-048-6/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Feature branch for a new override index manual page.Jacob Champion2017-05-040-0/+0
| | | | | | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793921 13f79535-47bb-0310-9956-ffa450edef68
* | | docs: updateJacob Champion2017-05-0416-17/+19
|/ / | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793931 13f79535-47bb-0310-9956-ffa450edef68
* | On the trunk:Stefan Eissing2017-05-022-5/+2
| | | | | | | | | | | | | | | | mod_proxy_http2: update after backport git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793533 13f79535-47bb-0310-9956-ffa450edef68
* | On the trunk:Stefan Eissing2017-05-022-0/+29
| | | | | | | | | | | | | | | | 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
* | Remove a space to synch with 2.4.x.Christophe Jaillet2017-05-011-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793314 13f79535-47bb-0310-9956-ffa450edef68
* | Synch with 2.4.x.Christophe Jaillet2017-05-011-3/+3
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793291 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status