granicus.if.org Git - apache/log

]> granicus.if.org Git - apache/log

projects / apache / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Evgeny Kotkov [Tue, 11 Jul 2017 16:46:47 +0000 (16:46 +0000)]

mpm_winnt: Avoid using TerminateThread() in case the shutdown routine
hits a timeout while waiting for the worker threads to exit.

Using TerminateThread() can have dangerous consequences such as deadlocks —
say, if the the thread is terminated while holding a lock or a heap lock
in the middle of HeapAlloc(), as these locks would not be released.
Or it can corrupt the application state and cause a crash.

(See https://msdn.microsoft.com/en-us/library/windows/desktop/ms686717)

Rework the code to call TerminateProcess() in the described circumstances
and leave the cleanup to the operating system.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801636 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Evgeny Kotkov [Tue, 11 Jul 2017 16:41:51 +0000 (16:41 +0000)]

mpm_winnt: Make the shutdown faster by avoiding unnecessary Sleep()'s
when shutting down the worker threads.

Previously, the shutdown code was posting an amount of I/O completion
packets equal to the amount of the threads blocked on the I/O completion
port. Then it would Sleep() until all these threads "acknowledge" the
completion packets by decrementing the global amount of blocked threads.

A better way would be to send the number of IOCP_SHUTDOWN completion
packets equal to the total amount of threads and immediately proceed to
the next step. There is no need to block until the threads actually receive
the completion, as the shutdown process includes a separate step that waits
until the threads exit, and the new approach avoids an unnecessary delay.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801635 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jean-Frederic Clere [Tue, 11 Jul 2017 11:41:44 +0000 (11:41 +0000)]

Add logic to read the Upgrade header and use it in the response.
Use we you are proxying to a server that has multiple upgrade on the same IP/Port.
PR 61142

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801594 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Evgeny Kotkov [Mon, 10 Jul 2017 12:22:31 +0000 (12:22 +0000)]

mpm_winnt: Following up on r1801144, use the new accept_filter_e enum
values in a couple of missed places in winnt_accept().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801456 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Evgeny Kotkov [Fri, 7 Jul 2017 11:15:31 +0000 (11:15 +0000)]

mpm_winnt: Fix typo in the logged message in winnt_get_connection().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801148 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Evgeny Kotkov [Fri, 7 Jul 2017 11:14:25 +0000 (11:14 +0000)]

mpm_winnt: Refactor the mpm_get_completion_context() function so that it
would return a proper apr_status_t instead of yielding the result via the
*timeout out variable.

This makes the calling side easier to follow by avoiding an additional
layer of if's.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801147 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Evgeny Kotkov [Fri, 7 Jul 2017 11:08:26 +0000 (11:08 +0000)]

mpm_winnt: Remove an unnecessary retry after receiving a non-timeout failure
from the mpm_get_completion_context() function.

Currently, the only possible reasons why mpm_get_completion_context() could
fail are real errors such as being unable to WaitForSingleObject(), allocate
memory or create an event. Retrying under such circumstances doesn't make
sense, and could be as well considered harmful.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801146 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Evgeny Kotkov [Fri, 7 Jul 2017 11:00:07 +0000 (11:00 +0000)]

mpm_winnt: Factor out a helper function to parse the type of an accept
filter and use an appropriate enum for it.

This makes the code in winnt_accept() a bit easier to follow. As a minor
side effect, it also fixes a small bug where the "unrecognized AcceptFilter
'%s'" log entry would always contain "none" instead of the actually
unrecognized kind of the accept filter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801144 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Evgeny Kotkov [Fri, 7 Jul 2017 10:51:23 +0000 (10:51 +0000)]

mpm_winnt: Don't forget to close the I/O completion port as part of the
cleanup in the child process.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801143 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Eissing [Thu, 6 Jul 2017 08:15:27 +0000 (08:15 +0000)]

On the trunk:

mod_http2: Simplify ready queue, less memory and better performance. Update
mod_http2 version to 1.10.7.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800978 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Wed, 5 Jul 2017 19:44:30 +0000 (19:44 +0000)]

Correct string scope to prevent duplicated values for subsequent tokens.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800919 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Wed, 5 Jul 2017 19:42:30 +0000 (19:42 +0000)]

Fix negotiation type parsing to be strict about "*", "*/*" and "type/*"
comparisons.

Submitted by: wrowe, Robert Święcki <robert swiecki.net>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800917 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Tue, 4 Jul 2017 22:41:31 +0000 (22:41 +0000)]

Backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800837 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Tue, 4 Jul 2017 22:14:13 +0000 (22:14 +0000)]

Fix another mod_lua compile error.
Compilation now tested against Lus 5.1, 5.2
and 5.3. The libs were compiled with COMPAT
flags set, but mod_lua no longer sets them
so it should compile and run with non-COMPAT
libs as well.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800833 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Tue, 4 Jul 2017 21:48:41 +0000 (21:48 +0000)]

Fix new compilation breakage in mod_lua.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800830 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Tue, 4 Jul 2017 20:49:53 +0000 (20:49 +0000)]

Mostly revert the configure compat check for
lua from r1785753. This should now no longer
be needed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800819 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Tue, 4 Jul 2017 20:48:43 +0000 (20:48 +0000)]

Fix last compat issue with Lua 5.2 and 5.3.
Patch taken from PR58188 which picked it from
openSUSE.

Still needs testing.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800817 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Tue, 4 Jul 2017 20:35:06 +0000 (20:35 +0000)]

More mod_lua compat for Lua 5.1, 5.2, 5.3.

One last use of luaL_register() with a non-NULL
"name" argument remaining.

Not tested yet.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800815 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Tue, 4 Jul 2017 19:22:23 +0000 (19:22 +0000)]

mod_lua: Improve compatibility with Lua 5.1, 5.2 and 5.3.
PR58188, PR60831, PR61245.

Still to solve: replace uses of luaL_register().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800809 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Tue, 4 Jul 2017 14:00:29 +0000 (14:00 +0000)]

Add mod_proxy_hcheck to generated httpd.spec file. PR 60506.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800788 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Eissing [Mon, 3 Jul 2017 15:44:54 +0000 (15:44 +0000)]

On the trunk:

mod_http2: disable and give warning when mpm_prefork is encountered.
The server will continue to work, but HTTP/2 will no longer be negotiated.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800689 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Jul 2017 10:56:29 +0000 (10:56 +0000)]

backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800627 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Mon, 3 Jul 2017 06:37:45 +0000 (06:37 +0000)]

* Do not apply the strict permissions of the temporary file to a possibly
existing passwd file.
This long standing bug was triggered by fixing a bug in APR in r1791029.

PR: 61240

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800594 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sun, 2 Jul 2017 12:42:19 +0000 (12:42 +0000)]

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800560 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sun, 2 Jul 2017 12:41:20 +0000 (12:41 +0000)]

XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800559 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 30 Jun 2017 12:34:19 +0000 (12:34 +0000)]

Partial reversal of r1800306... note virtual scripts in notes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800393 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jacob Champion [Thu, 29 Jun 2017 17:43:48 +0000 (17:43 +0000)]

proxy_fcgi: remove FPM-specific logic

Reverts r1780328, r1780329, and their associated followups, which
incorrectly manipulated SCRIPT_NAME by default. All proxy_fcgi.t
regression tests now pass.

PR: 61202

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800306 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Wed, 28 Jun 2017 16:13:13 +0000 (16:13 +0000)]

Updates to files referencing new Spanish translation of mod_allowmethods r1800183

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800184 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Wed, 28 Jun 2017 16:06:50 +0000 (16:06 +0000)]

Added Spanish translation for manual/mod/mod_allowmethods.xml.es

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800183 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Wed, 28 Jun 2017 14:15:28 +0000 (14:15 +0000)]

Restore single-char field names inadvertantly disallowed in 2.4.25.
PR: 61220
Submitted by: ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800173 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Wed, 28 Jun 2017 14:06:24 +0000 (14:06 +0000)]

Revert 1800111 for a cleaner logic flow proposed by Yann

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800171 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 28 Jun 2017 06:50:00 +0000 (06:50 +0000)]

* Silence compiler warning

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800126 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Wed, 28 Jun 2017 02:33:29 +0000 (02:33 +0000)]

Appears to resolve the issue to permit single-char fieldnames; PR61220

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800111 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Mon, 26 Jun 2017 19:09:22 +0000 (19:09 +0000)]

Added updates to files referencing new Spanish translation of mod_allowhandlers r1799971

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799972 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Mon, 26 Jun 2017 19:03:38 +0000 (19:03 +0000)]

Added Spanish translation for manual/mod/mod_allowhandlers.xml.es

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799971 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Mon, 26 Jun 2017 18:36:28 +0000 (18:36 +0000)]

Synch with 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799968 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Mon, 26 Jun 2017 17:45:23 +0000 (17:45 +0000)]

Revert misguided commit r1799731.

Discussion on-list, but any occurance of a platform-specific behavior in this
code path will alter the behavior of the core code and introduce the very
fingerprintable behavior this patch pretended to obscuficate.

Returning 404 for /CON for example may lead to a module such as mod_speling
revealing the existance of a real file named similar to /.conf, which makes
this an unwise behavior.

Further discussion of returning 404 for all CHR files encountered in the
filepath (not URI path), which currently return 403 on all platforms,
belongs on the dev list.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799965 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sun, 25 Jun 2017 14:46:47 +0000 (14:46 +0000)]

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799810 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sun, 25 Jun 2017 14:45:54 +0000 (14:45 +0000)]

XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799809 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Sun, 25 Jun 2017 07:10:19 +0000 (07:10 +0000)]

Add CHANGE entry

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799786 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Sun, 25 Jun 2017 07:05:17 +0000 (07:05 +0000)]

Remove a backported entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799785 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Sun, 25 Jun 2017 06:09:43 +0000 (06:09 +0000)]

Since r1753257, "HEAD" method is registered into the registry hash with the M_GET ID.
(r1757672 in 2.4.x)

We iterate over all the values of the registery, so there is no need anymore to have a special case for "HEAD" in 'make_allow()'. It has its own entry now.

With the current code, we have "HEAD" 3 times in the Allow Header field.
This is because we find M_GET 2 times in the registry hash. The first one gives "GET" and "HEAD" (as the special handling), and the second "HEAD" and "HEAD" (as the special handling).

BTW, use APR_ARRAY_PUSH instead of hand coding it, in oder to have the code more readable.

PR 61207

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799784 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Gregg Lewis Smith [Sat, 24 Jun 2017 05:55:22 +0000 (05:55 +0000)]

style: where did the tabs come from?
no code changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799732 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Gregg Lewis Smith [Sat, 24 Jun 2017 05:49:45 +0000 (05:49 +0000)]

Send a 404 response like other OSs do instead of 403 on Windows when
a path segment or file requested uses a reserved word so Windows
cannot be fingerprinted. PR55887

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799731 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 23 Jun 2017 15:45:14 +0000 (15:45 +0000)]

xforms updates

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799684 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Luca Toscano [Fri, 23 Jun 2017 15:25:06 +0000 (15:25 +0000)]

core documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799681 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Luca Toscano [Fri, 23 Jun 2017 15:24:42 +0000 (15:24 +0000)]

core.xml: Wrap a Define directive sentence in a <note>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799680 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Fri, 23 Jun 2017 06:52:36 +0000 (06:52 +0000)]

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799649 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Thu, 22 Jun 2017 20:06:48 +0000 (20:06 +0000)]

Fixed wrong revision number references in translations with original mod_alias.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799611 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Thu, 22 Jun 2017 19:20:36 +0000 (19:20 +0000)]

Added updates to files referencing new Spanish translation of mod_alias r1799605

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799606 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Thu, 22 Jun 2017 19:11:16 +0000 (19:11 +0000)]

Added Spanish translation for manual/mod/mod_alias.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799605 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 16:29:54 +0000 (16:29 +0000)]

OK... we display ms, since we want to be able to provide
values for <1sec, so entries should assume ms input when
using bal-mgr

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799485 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 16:24:00 +0000 (16:24 +0000)]

allow balancer-manager to also accept subsecond intervals

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799482 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Wed, 21 Jun 2017 16:13:34 +0000 (16:13 +0000)]

Fixed a small typo (double if) in r1799475

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799478 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Wed, 21 Jun 2017 16:01:23 +0000 (16:01 +0000)]

Fixed a small statement about the result of Redirect when scheme and hostname is not defined in the directive

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799475 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jacob Champion [Wed, 21 Jun 2017 15:54:53 +0000 (15:54 +0000)]

util.c: revert r1799375 during veto discussion

https://lists.apache.org/thread.html/c0320136ae7e4cbbae03cb2636dfb9b693b2d7a6ffb4c9a645beadb9@%3Cdev.httpd.apache.org%3E

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799472 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 15:10:00 +0000 (15:10 +0000)]

missed one.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799467 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 15:07:16 +0000 (15:07 +0000)]

xforms... again.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799465 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 15:00:46 +0000 (15:00 +0000)]

some more nits

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799463 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 14:51:09 +0000 (14:51 +0000)]

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799461 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 14:46:56 +0000 (14:46 +0000)]

start documenting those that use the time-interval format

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799460 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 14:34:44 +0000 (14:34 +0000)]

stupid typos

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799456 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 14:33:29 +0000 (14:33 +0000)]

cforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799455 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 14:29:34 +0000 (14:29 +0000)]

Add time-interval as Syntax argument type

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799454 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 13:53:56 +0000 (13:53 +0000)]

Proxy timeout statements now sub-second granularity

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799444 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 13:21:55 +0000 (13:21 +0000)]

unused now

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799438 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 13:21:18 +0000 (13:21 +0000)]

Allow finer control over hcheck intervals... minimum is whatever
the watchdog slice is.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799437 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 12:49:54 +0000 (12:49 +0000)]

Allow WatchdogInterval to be sub 1 second

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799435 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 12:34:25 +0000 (12:34 +0000)]

Not an error... last one is honored

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799431 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 11:06:37 +0000 (11:06 +0000)]

update trunk docs xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799426 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 21 Jun 2017 10:54:44 +0000 (10:54 +0000)]

Make case insensitive

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799425 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jacob Champion [Tue, 20 Jun 2017 23:55:20 +0000 (23:55 +0000)]

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

(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

commit | commitdiff | tree

Jacob Champion [Tue, 20 Jun 2017 23:55:17 +0000 (23:55 +0000)]

ap_get_basic_auth_components: add unit tests

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799379 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jacob Champion [Tue, 20 Jun 2017 23:42:12 +0000 (23:42 +0000)]

httpdunit: merge to trunk from feature branch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799378 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jacob Champion [Tue, 20 Jun 2017 23:34:30 +0000 (23:34 +0000)]

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

commit | commitdiff | tree

Jacob Champion [Tue, 20 Jun 2017 23:34:18 +0000 (23:34 +0000)]

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

commit | commitdiff | tree

Jacob Champion [Tue, 20 Jun 2017 23:08:19 +0000 (23:08 +0000)]

util.c: ensure all TEST_CHAR loops stop at the null terminator

In the aftermath of CVE-2017-7668, decouple the business logic ("is NULL
a T_HTTP_CTRL") from the postcondition ("must not go past the end of the
string"). The NULL-byte classification in the TEST_CHAR table may change
in the future.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799375 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jacob Champion [Tue, 20 Jun 2017 23:08:18 +0000 (23:08 +0000)]

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

commit | commitdiff | tree

Ruediger Pluem [Tue, 20 Jun 2017 12:17:52 +0000 (12:17 +0000)]

* The libnghttp2.pc might be found in lib64 on 64 bit systems

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799341 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Mon, 19 Jun 2017 19:08:49 +0000 (19:08 +0000)]

fix for RewriteOptions processing in r1798938

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799261 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Fri, 16 Jun 2017 15:13:03 +0000 (15:13 +0000)]

add RewriteOptions LongURLOptimization

Variable expansion in RewriteCond causes strings to be duplicated
out of r->pool. If the variables are long and many conditions
are evaluated, r->pool can get seriously bloated.

Clear the memory used for variable expansion for each set of conditons
once the set of conditions fails to match.

edit: revised in 1799261

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798938 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Wed, 14 Jun 2017 22:29:17 +0000 (22:29 +0000)]

Quiet spurious gcc warning in ap_parse_form_data ("'escaped_char[0]' may be
used uninitialized in this function").

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798785 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Luis Gil [Wed, 14 Jun 2017 21:57:53 +0000 (21:57 +0000)]

added the line <page href="mod/overrides.html">Sobreescritura de la clase índice .htaccess</page>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798782 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Luis Gil [Wed, 14 Jun 2017 21:51:51 +0000 (21:51 +0000)]

checked what have changed, nothing to update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798781 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Mon, 12 Jun 2017 13:15:33 +0000 (13:15 +0000)]

Revert r1798456

* For the time being keep on caching OCSP_RESPONSE_STATUS_TRYLATER. The effect can be limited by setting SSLStaplingErrorCacheTimeout.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798460 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Mon, 12 Jun 2017 12:53:38 +0000 (12:53 +0000)]

* Only report success, if had real one.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798457 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Mon, 12 Jun 2017 12:49:06 +0000 (12:49 +0000)]

* Do not cache OCSP_RESPONSE_STATUS_TRYLATER.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798456 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Mon, 12 Jun 2017 12:48:30 +0000 (12:48 +0000)]

* Mark OCSP_RESPONSE_STATUS_TRYLATER as error response

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1798455 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Wed, 7 Jun 2017 00:52:10 +0000 (00:52 +0000)]

allow quoted paths in <IfFile>

The boilerplate code for config sections conflicts with TAKE1
because of the trailing stuff to terminate the opening tag.

Change from TAKE1 to RAW_ARGS and call ap_getword_conf()
directly.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797844 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Wed, 7 Jun 2017 00:24:31 +0000 (00:24 +0000)]

remove taint checking from proxy_handler

rewrite tests with P flag in htaccess broken since r1792169

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797843 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Eissing [Tue, 6 Jun 2017 09:10:01 +0000 (09:10 +0000)]

On the trunk:

update after backport of mod_http2 fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797759 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Luca Toscano [Tue, 6 Jun 2017 08:05:55 +0000 (08:05 +0000)]

Update CHANGES after backports

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797747 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Eissing [Tue, 6 Jun 2017 07:58:57 +0000 (07:58 +0000)]

On the trunk:

mod_http2: Fix for possible CPU busy loop introduced in v1.10.3 where a stream may keep
the session in continuous check for state changes that never happen.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797745 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Tue, 6 Jun 2017 05:49:27 +0000 (05:49 +0000)]

Fix typo.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797731 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Mon, 5 Jun 2017 13:13:21 +0000 (13:13 +0000)]

whitespace and match 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797662 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Mon, 5 Jun 2017 13:12:25 +0000 (13:12 +0000)]

a few more backported fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797661 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Mon, 5 Jun 2017 13:11:11 +0000 (13:11 +0000)]

remove some backported items

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797660 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Sat, 3 Jun 2017 22:04:47 +0000 (22:04 +0000)]

mod_mime: fix quoted pair scanning

Submitted By: ylavic
CVEID: CVE-2017-7679

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797550 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Tue, 30 May 2017 13:39:45 +0000 (13:39 +0000)]

whitespace only

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796864 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Ferradal [Mon, 29 May 2017 22:08:22 +0000 (22:08 +0000)]

New Spanish translations for mod_actions.xml.es and related files referencing or related to it

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796708 13f79535-47bb-0310-9956-ffa450edef68

Unnamed repository; edit this file 'description' to name the repository.