www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
20,628 Commits 62 Branches 306 Tags
d4d90bdf0a9ba330901b17f52bdbe8303220256c
Commit Graph

7085 Commits

Author SHA1 Message Date
Jeff Trawick
d4d90bdf0a suEXEC: Add Suexec directive to disable suEXEC without renaming the 
binary (Suexec Off), or force startup failure if suEXEC is required
but not supported (Suexec On).  Change SuexecUserGroup to fail 
startup instead of just printing a warning if suEXEC is disabled.

Additionally, ap_unixd_config.suexec_disabled_reason has a message,
suitable for logging/messaging, explaining why the feature isn't
available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033519 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-10 15:34:43 +00:00
Stefan Fritsch
60d6e32249 Add support for conditional logging depending on an expression. 
The syntax is a bit unwieldy, the quotes have to start before
the 'expr=':

    CustomLog "logs/cond_log" combined "expr=req('User-Agent') == 'x'"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033157 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-09 18:59:33 +00:00
Stefan Fritsch
3037f411c9 use temp_pool for some temporary regexps 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033145 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-09 18:34:43 +00:00
Graham Leggett
3aecbb0543 mod_rewrite: Fix the RewriteEngine directive to work within a 
location. Previously, once RewriteEngine was switched on globally,
it was impossible to switch off.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032431 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-08 00:41:35 +00:00
Jeff Trawick
a1a3d3820c mark connection for close after the return from 
ap_proxy_determine_connection()

before this revision: if there was an existing connection,
ap_proxy_determine_connection() would close it but then clear
the close flag, so it didn't get closed by
ap_proxy_release_connection()

thus, if this child process doesn't use the connection for a
while, the application could be stuck in read() for the same
while

after: ap_proxy_release_connection() will close it after the
request completes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032345 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-07 18:54:44 +00:00
Jeff Trawick
f0fb1e6653 log how long worker will be disabled 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032290 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-07 14:49:58 +00:00
Jeff Trawick
c0d5e1671d improve wording of some function descriptions 
add explicit "FIXME" to an ancient issue

remove implicit fixme wording related to mutex use


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032286 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-07 14:35:21 +00:00
Jeff Trawick
c7d76f1aac axe outdated comment about FIXMEs/CHECKMEs 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032271 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-07 13:13:26 +00:00
Jeff Trawick
2c8ec34cd0 avoid duplicate end-of-stdin header 
avoid passing {iov_base = &buffer, iov_len=0} to writev() when
there is no stdin data


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032266 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-07 12:35:32 +00:00
Stefan Fritsch
1f7417309f add support for trace loglevels in mod_lua 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032084 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-06 14:48:43 +00:00
Stefan Fritsch
35cdba6976 Replace ap_expr with a parser derived from mod_ssl's parser. Make mod_ssl use 
the new parser. Rework ap_expr's public interface and provide hooks for modules
to add variables and functions.

The Netware and Windows build files still need to be adjusted


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032073 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-06 14:31:16 +00:00
Stefan Fritsch
11185f3163 Put the expression parser back into mod_include 
This reverts r642559 and r642978


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032059 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-06 14:03:13 +00:00
Stefan Fritsch
26d9243e32 Fix hook sorting for the pre_config hook. 
Move modules/http/config2.m4 back to modules/http/config.m4, since this was
only done as work-around in r88887 for the broken hook-sorting.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032002 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-06 11:11:17 +00:00
Jim Jagielski
a280069b3c a pointer optim. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031798 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 21:17:05 +00:00
Eric Covener
b73db43c7a PR47765: ProxyPass and ProxyPassReverse should not be accepted in 
Directory or Files sections.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031758 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 20:03:02 +00:00
Eric Covener
c145eb760d Change the default of the Header directive to apply to responses of all types 
instead of just 2xx successful responses.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031670 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 17:20:31 +00:00
Eric Covener
5398ce8195 rename the mod_headers variables used to track onsuccess vs. always for clarity 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031669 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 17:15:50 +00:00
Jeff Trawick
2223171dd9 gratuitous style change 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031614 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 15:05:39 +00:00
Jeff Trawick
91ab95835f repeat apr_poll() while EINTR 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031613 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 15:04:37 +00:00
Eric Covener
b76f1b5dbf PR50220: keep on chugging after EINTR in mod_proxy_connect 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031551 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 13:12:14 +00:00
Eric Covener
025ffd8686 PR#47766 mod_autoindex directives not merged into sections with no autoindex directives. 
This is due to an empty "opts" field looking just like one that has specified "None".  None is always
alone, so simplify and test for equality.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031430 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 04:45:21 +00:00
Rich Bowen
03d6bcb14f Error messages like "theoretically shouldn't happen" are incredibly 
unhelpful, particularly when they do happen with some regularity.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031057 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-04 16:15:03 +00:00
Graham Leggett
c81adad105 Fix a pool lifetime issue: Make sure we clean up our brigade before we 
hand the backend connection back to the connection pool.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1030855 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-04 08:37:13 +00:00
Rainer Jung
2d9338d1dd Followup to r1026665: reset "cleaned" flag in 
ap_proxy_acquire_connection().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1030850 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-04 08:09:57 +00:00
Jim Jagielski
e0d16cce4d Note for future dev.... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1030496 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-03 15:21:50 +00:00
Nick Kew
8b659b457c mod_cache: correctly parse quoted strings in cache headers. 
PR 50199


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1030299 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-03 00:16:47 +00:00
Daniel Earl Poirier
4485859b81 Remove mis-placed period. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029935 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-02 01:15:19 +00:00
Daniel Earl Poirier
cdbc0f2c3f Warning in configure -h that mod_dumpio was only for developers 
and testing was erroneous.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029931 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-02 00:47:21 +00:00
Daniel Earl Poirier
4c477008d4 Add to modules' help text (displayed by ./configure -h) more 
information that will be useful in deciding whether to enable
them or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029814 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-01 20:02:51 +00:00
Daniel Earl Poirier
6b803976f2 Fix a number of typos and misspellings. Reported by Ville Skytta. 
PR48496.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029134 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-30 17:56:13 +00:00
Eric Covener
a81eb0d43d Add an END flag to RewriteRule that acts like L=LAST but also prevents 
further rounds of rewrite processing due to per-directory substitutions.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1028778 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-29 14:43:49 +00:00
Stefan Fritsch
7b9471c76f handle the ca_list == NULL case correctly (which can only happen with out 
of memory, anyway)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1027239 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-25 19:13:20 +00:00
Stefan Fritsch
59d4757c65 Make sure to always log an error if loading of CA certificates fails 
PR: 40312
Submitted by: Paul Tiemann <issues apache org ourdetour com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026906 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-24 22:14:15 +00:00
Stefan Fritsch
d658afdd1c Consistently use loglevel emerg before ssl_die() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026903 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-24 21:57:08 +00:00
Guenter Knauf
52210adbd1 Another NetWare makefile cleanup. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026810 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-24 14:54:38 +00:00
Rich Bowen
21195ea61f Phrasing changes recommended by Jack Dozier. Bug #50145 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026792 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-24 13:24:31 +00:00
Stefan Fritsch
a1662e0f41 If an unknown Content-* header is received for a PUT request, we must not 
ignore it but reply with 501 per RFC 2616 9.6.

PR: 42978


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026746 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-24 08:32:10 +00:00
Stefan Fritsch
25ef3c1325 If a malformed Content-Range header is received for a PUT request, we 
must not use the supplied content per RFC 2616 14.16. Send 400 response
instead of ignoring the Content-Range.

PR: 49825


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026743 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-24 08:17:26 +00:00
Stefan Fritsch
a8a2cd0164 Improve error message if client cert verification fails 
PR: 50093
Submitted by: Lassi Tuura <lat cern ch>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026703 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-23 22:17:44 +00:00
Graham Leggett
87c10fe5f1 Optimise more of the flags within proxy structures. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026668 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-23 19:34:16 +00:00
Graham Leggett
9d58cd6990 mod_proxy: Release the backend connection as soon as EOS is detected, 
so the backend isn't forced to wait for the client to eventually
acknowledge the data.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026665 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-23 19:26:44 +00:00
Stefan Fritsch
00f70ddc9a more temp pool usage and remove some useless apr_pstrdup()s 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026660 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-23 18:35:06 +00:00
Stefan Fritsch
6f7f117b5d use temp_pool for version parsing, to save some memory 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026637 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-23 16:27:52 +00:00
Stefan Fritsch
73ea59a31a Remove needless pool cleanup. ap_pregcomp already registers a cleanup for the 
regex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026636 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-23 16:20:10 +00:00
Graham Leggett
9619a17b78 mod_cache: Respect the original Cache-Control header if no header arrives 
with a 304 Not Modified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026617 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-23 14:11:20 +00:00
Graham Leggett
5aff0e237b mod_disk_cache: Make sure we step down cleanly when we've ben configured 
to cache but haven't set a CacheRoot.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026612 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-23 12:36:23 +00:00
Rich Bowen
10916d6d51 Take a slightly less "you broke it!!" tone in the default 500 Internal 
Server Error default error message. (Bug #50145)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026473 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-22 20:03:22 +00:00
Graham Leggett
8e5be99791 Fix an inline variable declaration. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026187 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-22 00:46:39 +00:00
Graham Leggett
13fec746f9 mod_proxy: Optimise ProxyPass within a Location so that it is stored 
per-directory, and chosen during the location walk. Make ProxyPass
work correctly from within a LocationMatch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026184 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-22 00:13:45 +00:00
Graham Leggett
8de5190445 Be compliant with RFC2616 14.46, revalidation failed is Warning 111, not 
Warning 110.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026173 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-21 23:00:09 +00:00