1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

26790 Commits

Author SHA1 Message Date
Christophe Jaillet
25a2e41ea7 Save a few bytes in conf pool when parsing some directives. Use temp_pool when applicable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657692 13f79535-47bb-0310-9956-ffa450edef68
2015-02-05 21:03:04 +00:00
Christophe Jaillet
be32097e6c Improve doc as spotted by Kalessin in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657687 13f79535-47bb-0310-9956-ffa450edef68
2015-02-05 20:47:08 +00:00
Rainer Jung
7439a429d6 Expression parser: Optimize another concatenation
case by using iteration instead of recursion.

We have a relatively small recursion limit of
about 10 operations. This is a compilation
limit (a define). It can be hit if many expr
vars or function calls are concatenated.

The new optimization is very similar to the
existing one, which optimizes consecutive
concatenations in node2 of the tree. The new
one optimizes consecutive concatenations in
node 1.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657685 13f79535-47bb-0310-9956-ffa450edef68
2015-02-05 20:33:59 +00:00
Yann Ylavic
c558110372 CHANGES: Follow up to r1657636, clarify message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657638 13f79535-47bb-0310-9956-ffa450edef68
2015-02-05 17:43:18 +00:00
Yann Ylavic
c6f5f2f63f mod_proxy_connect/wstunnel: If both client and backend sides get readable
at the same time, don't lose errors occuring while forwarding on the first
side when none occurs next on the other side, and abort.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657636 13f79535-47bb-0310-9956-ffa450edef68
2015-02-05 17:36:23 +00:00
Christophe Jaillet
dd945fd961 Fix typo spotted by micha137 in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657407 13f79535-47bb-0310-9956-ffa450edef68
2015-02-04 21:38:15 +00:00
Eric Covener
6c0cf71485 followup to r1657261 whitespace only -- reindent body of while loop.
(no change under svn diff -x-w)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657263 13f79535-47bb-0310-9956-ffa450edef68
2015-02-04 14:52:50 +00:00
Eric Covener
78eb3b9235 *) SECURITY: CVE-2015-0228 (cve.mitre.org)
mod_lua: A maliciously crafted websockets PING after a script
     calls r:wsupgrade() can cause a child process crash.
     [Edward Lu <Chaosed0 gmail.com>]

Discovered by Guido Vranken <guidovranken gmail.com>

Submitted by: Edward Lu
Committed by: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657261 13f79535-47bb-0310-9956-ffa450edef68
2015-02-04 14:44:23 +00:00
Eric Covener
8f40799093 Fix bit-shifting of websockets frame fields that would yield wrong opcodes
when the FIN bit was set.  Results in PING not being recognized
by mod_lua.  PR57524

Submitted By: Edward Lu
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657256 13f79535-47bb-0310-9956-ffa450edef68
2015-02-04 14:33:51 +00:00
Yann Ylavic
e454f1a48b mod_macro: Clear macros before initialization to avoid use-after-free
on startup or restart when the module is linked statically. PR 57525

Submitted by: apache.org tech.futurequest.net
Committed by: Yann Ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656669 13f79535-47bb-0310-9956-ffa450edef68
2015-02-03 10:42:21 +00:00
Christophe Jaillet
ea86cb0cfa Fix cut and paste typo in error message + remove empty lines to be consistent
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656549 13f79535-47bb-0310-9956-ffa450edef68
2015-02-02 19:31:37 +00:00
Yann Ylavic
68b35f4aa3 Follow up to r1635521: ListenCoresBucketsRatio's manual.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656368 13f79535-47bb-0310-9956-ffa450edef68
2015-02-01 22:13:15 +00:00
Yann Ylavic
319f8efae9 Follow up to r1656259: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656359 13f79535-47bb-0310-9956-ffa450edef68
2015-02-01 21:10:03 +00:00
Lucien Gentis
e193ed51cb Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656324 13f79535-47bb-0310-9956-ffa450edef68
2015-02-01 16:38:40 +00:00
Lucien Gentis
5491f4a0ae XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656323 13f79535-47bb-0310-9956-ffa450edef68
2015-02-01 16:37:29 +00:00
Kaspar Brand
f47c136f9c adjust link to SSL_CONF_cmd man page on www.openssl.org
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656269 13f79535-47bb-0310-9956-ffa450edef68
2015-02-01 08:11:59 +00:00
Yann Ylavic
ccc2e4c751 mod_proxy_http: don't connect or reuse backend before prefetching request body.
The goal is to minimize the delay between this connection is considered alive
and the first bytes sent (should the client's link be slow or some input filter
retain the data).
This is a best effort to prevent the backend from closing (from under us) what
it thinks is an idle connection, hence to reduce to the minimum the unavoidable
local ap_proxy_is_socket_connected() vs remote keepalive race condition.
PR 56541.

Also, allow the new subprocess_env variable "proxy-flushall" to prevent any
buffering of the request body before it is forwarded to the backend.
When set, the prefetch is still done (although non-blocking), so we can still
determine Content-Length vs chunked vs spooled (depending on data available
with the header or while reading it), and then all brigades are flushed when
passed to the backend.
PR 37920.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656259 13f79535-47bb-0310-9956-ffa450edef68
2015-02-01 00:05:59 +00:00
Yann Ylavic
12af2e3ac2 mod_proxy_connect: fix duplicated AH introduced by r1635645.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656230 13f79535-47bb-0310-9956-ffa450edef68
2015-01-31 18:19:59 +00:00
Yann Ylavic
89a027a48a mod_alias: follow up to r1653941.
Fill empty APLOGNO().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656225 13f79535-47bb-0310-9956-ffa450edef68
2015-01-31 17:53:42 +00:00
Eric Covener
c2d3d469ca correct copy/paste error, use cmd->cmd->name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656122 13f79535-47bb-0310-9956-ffa450edef68
2015-01-30 21:11:36 +00:00
Eric Covener
adcd01df7c Block Define/Undefine from per-directory context, because they will
fire while the block is read not when it evaluates for a given
request.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656063 13f79535-47bb-0310-9956-ffa450edef68
2015-01-30 17:17:12 +00:00
Eric Covener
d5227d2da4 expand comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656062 13f79535-47bb-0310-9956-ffa450edef68
2015-01-30 17:15:02 +00:00
Eric Covener
2154a9de68 Provide a way for EXEC_ON_READ directives to see their context
(parent directive).

Usually, this context is not also EXEC_ON_READ so it's not fully processed, so
e.g cmd->path is not fluffed up yet because the closing tag
of the section is not read yet and ap_check_cmd_context()
doesn't work)




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656058 13f79535-47bb-0310-9956-ffa450edef68
2015-01-30 16:58:20 +00:00
Mike Rumph
2c3fe611bc Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655920 13f79535-47bb-0310-9956-ffa450edef68
2015-01-30 02:39:37 +00:00
Mike Rumph
37c3e78ced Fix typo in mod_deflate doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655917 13f79535-47bb-0310-9956-ffa450edef68
2015-01-30 02:33:55 +00:00
Mike Rumph
1c1781a326 Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655906 13f79535-47bb-0310-9956-ffa450edef68
2015-01-30 02:05:38 +00:00
Mike Rumph
620b1eab64 Fix typos in mod_deflate doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655904 13f79535-47bb-0310-9956-ffa450edef68
2015-01-30 01:57:06 +00:00
Mike Rumph
86f9bb0559 Added doc links between mod_proxy_fcgi and mod_authnz_fcgi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655778 13f79535-47bb-0310-9956-ffa450edef68
2015-01-29 18:24:12 +00:00
Mike Rumph
93712920fc Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655767 13f79535-47bb-0310-9956-ffa450edef68
2015-01-29 17:55:10 +00:00
Eric Covener
a77068dd87 AP_INIT_NO_ARGS mishandled in macro
Submitted by: Joachim Zobel <jzobel heute-morgen.de>, covener
Committed by: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655146 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 20:21:48 +00:00
Christophe Jaillet
95d663edf3 Improve r1525489 (one line with a "-" was forgotten) and synch with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655141 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 20:02:36 +00:00
Christophe Jaillet
09a839dd94 Fix doc as spotted by mebjas.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654984 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 07:21:07 +00:00
Christophe Jaillet
fd92456cd2 Fix doc as spotted by mrskman.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654983 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 07:11:37 +00:00
Eric Covener
97f708ce4f xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654832 13f79535-47bb-0310-9956-ffa450edef68
2015-01-26 16:00:06 +00:00
Eric Covener
8b65ae7f3c comment feedback -- flow is confusing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654831 13f79535-47bb-0310-9956-ffa450edef68
2015-01-26 15:59:59 +00:00
Lucien Gentis
2544334de1 XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654543 13f79535-47bb-0310-9956-ffa450edef68
2015-01-24 15:29:04 +00:00
Lucien Gentis
de3beb11e9 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654528 13f79535-47bb-0310-9956-ffa450edef68
2015-01-24 14:53:56 +00:00
Lucien Gentis
5a6c449afb XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654527 13f79535-47bb-0310-9956-ffa450edef68
2015-01-24 14:52:30 +00:00
Eric Covener
8dd6f463ed as in r1517366, drop the severity in authz_groupfile when a require
didn't match but no real error was encountered. 

This individual 'require group' may not really dictate who gets in. PR55523 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1654184 13f79535-47bb-0310-9956-ffa450edef68
2015-01-23 12:21:34 +00:00
Yann Ylavic
a365a65513 mod_ssl: Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context (new version of r1653906 reverted by r1653993).

Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Committed/modified By: ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653997 13f79535-47bb-0310-9956-ffa450edef68
2015-01-22 18:37:06 +00:00
Yann Ylavic
4c52577a7f mod_ssl: revert r1653906, will commit an alternative just after.
The issue with r1653906 is that existing configurations like
"SSLProtocol -SSLv3" (where the default is assumed to be ALL)
won't work anymore.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653993 13f79535-47bb-0310-9956-ffa450edef68
2015-01-22 18:27:46 +00:00
Graham Leggett
7e120c114b Use unsigned bit fields.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653978 13f79535-47bb-0310-9956-ffa450edef68
2015-01-22 18:06:57 +00:00
Graham Leggett
5488d21243 mod_alias: Introduce expression parser support for Alias, ScriptAlias
and Redirect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653941 13f79535-47bb-0310-9956-ffa450edef68
2015-01-22 17:02:22 +00:00
Eric Covener
6d6a8a16f1 Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context.

Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Commited By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653906 13f79535-47bb-0310-9956-ffa450edef68
2015-01-22 15:19:39 +00:00
William A. Rowe Jr
09a7ffc55d Bump mmn as documented in commit log msg r1653666
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653667 13f79535-47bb-0310-9956-ffa450edef68
2015-01-21 21:42:36 +00:00
William A. Rowe Jr
0271656a56 Revert r4635428 corresponding to PR41867.
The code reverted attempted to restrict comparisons of the r->filename
to given DirectoryMatch blocks.

r->filename was already a non-directory entity at this point, because we
have already fallen out of the } while (thisinfo.filetype == APR_DIR);
block above.

The addition of r->d_is_directory was redundant.  That is what is always
returned by ap_get_core_module_config(r->per_dir_config).

Note modifying dir_config required an MMN major bump as this commit could
have realigned the offset of refs (had it been added to the end, this
would correspond to an mmn minor bump) and other fields packed into the
same bytes (this is undefined). Bump on revert to prevent unexpected crashes.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-21 21:39:55 +00:00
Eric Covener
ce217cfc64 Remove the bitfield spec from the http_ctx_t.state enum
as it causes an error-prone mismatch between the enum values and the
state values.  Caused a busy loop in windows.  

Added in r1484852 and trunk-only.

Submitted By: Edward Lu, Yann Ylavic
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653539 13f79535-47bb-0310-9956-ffa450edef68
2015-01-21 14:09:49 +00:00
Rainer Jung
ff489513c8 Fix indentation and tab use after r1652955.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652989 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 12:42:41 +00:00
Rainer Jung
4822ab9bd3 Addition to r1652955: Use "=" in combination
with "test" instead of "==".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652985 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 12:34:29 +00:00
Rainer Jung
df2e9f3ba4 Fix detection of old Solaris versions.
Autotools need double square brackets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652982 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 12:22:34 +00:00