Lucien Gentis
9f81404ede
Update.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1236701 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 14:51:24 +00:00
Jim Jagielski
d052a532be
https also needs QS
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1236350 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 19:14:58 +00:00
Ruediger Pluem
556939e67f
* Don't typedef twice (in .c and .h file).
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1236122 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 10:03:36 +00:00
Stefan Fritsch
e499c6e683
Make the core input/output filter contexts private and provide accessor APIs
...
for mpm_winnt and mod_ftp.
This allows to add members to the context structs without breaking binary
compatibility.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1235019 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 21:58:42 +00:00
Joe Orton
b6f6f96733
* server/core_filters.c (send_brigade_nonblocking): Use a non-blocking
...
bucket read, allowing any pending data to be flushed before trying a
(potentially slow) blocking read.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234899 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 16:57:07 +00:00
Stefan Fritsch
60eb4d27eb
Document how Include should behave. The present inconsistencies are now subject
...
of PR 52505 instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234876 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 16:13:08 +00:00
Joe Orton
bf40995d94
* server/core_filters.c (ap_core_output_filter): Don't read the entire
...
output of a morphing bucket into RAM.
Submitted by: jorton, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234848 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 15:19:07 +00:00
Eric Covener
76aa41352d
CVE-2012-0053: Fix an issue in error responses that could expose
...
"httpOnly" cookies when no custom ErrorDocument is specified for
status code 400.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234837 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 15:04:09 +00:00
Stefan Fritsch
7cc2917b41
update xforms
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234644 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 23:30:02 +00:00
Stefan Fritsch
29bd6ba338
Fix docs for Include, add docs for IncludeOptional
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234643 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 23:26:31 +00:00
Stefan Fritsch
bbf60bffa7
Add a validate-xml target
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234642 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 23:19:57 +00:00
Stefan Fritsch
95bfe997d6
ctx->bytes_in is never used. Remove a useless iteration through the brigade
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234574 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 18:50:21 +00:00
Stefan Fritsch
c6e601be12
Improve indentation, no code change
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234565 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 18:27:11 +00:00
Lucien Gentis
fc71b2b27f
Update.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234511 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 13:27:38 +00:00
Stefan Fritsch
b26606a1c5
Document the rather surprising code path on Windows
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234479 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 10:48:23 +00:00
Stefan Fritsch
f21ee09d4a
More configure time dependencies:
...
mod_cache_disk depends on mod_cache
mod_heartbeat depends on mod_watchdog
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234297 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 10:26:51 +00:00
Stefan Fritsch
21cc07a470
Make APACHE_MODULE() accept an optional prerequisite module for configure.
...
Introduce the following configure time dependencies:
mod_proxy_* (except proxy_html) require mod_proxy
mod_dav_* require mod_dav
mod_session_* require mod_session
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234180 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 22:14:31 +00:00
Joe Orton
bcd017972c
* server/core_filters.c (ap_core_input_filter): Only treat EAGAIN as
...
success if a non-blocking read was requested; for a blocking read,
it is an error condition.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1233882 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 12:41:18 +00:00
Jeff Trawick
6635e5a3da
Adjust CVE-2011-3368/CVE-2011-4317 fixes to rely solely on
...
core's translate-name to fail unsupported URIs.
Rewrite and proxy now decline what they don't support rather
than fail the request.
Suggested by: trawick
Implemented by: jorton
Tweaked by: wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1233604 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 22:23:15 +00:00
Graham Leggett
bad70ddb3e
configure: Move the --with-included-apr check so that srcdir!=builddir builds
...
aren't broken by it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232838 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 11:30:27 +00:00
William A. Rowe Jr
46ea51cc73
Anticipate win32+win64
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232630 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 22:58:23 +00:00
William A. Rowe Jr
5153ca5d0c
Service named 2.x on trunk
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232624 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 22:50:13 +00:00
William A. Rowe Jr
6df305d79f
Further win32 edits anticipating 1.0.1-final is soon
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232622 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 22:49:16 +00:00
Stefan Fritsch
58dd721bc8
Reword the paragraph about --with-included-apr to mention the -deps
...
tarball.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232594 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:41:24 +00:00
Stefan Fritsch
5a05949a2f
Trunk is at 2.5
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232583 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:30:22 +00:00
Graham Leggett
a0930811c9
configure: Improve the error message when --with-included-apr is specified
...
but either APR or APR-Util is not included.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232575 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:12:19 +00:00
Graham Leggett
a94da6ff0f
RPM: Add mod_bucketeer, mod_case_filter and mod_case_filter_in to the RPM
...
spec file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232224 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 23:17:23 +00:00
Stefan Fritsch
3d7c32f8c7
Update xforms
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231783 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 22:46:12 +00:00
Jeff Trawick
00e489fc76
generated files and revision numbers
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231608 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 01:40:32 +00:00
Jeff Trawick
ae5d1f38b1
fix syntax errors in Mutex examples
...
Submitted by: Daniel Shahaf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231607 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 01:36:45 +00:00
Jeff Trawick
ba8bc09ce4
fix const warning with strchr->ap_strchr mapping
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231602 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 00:27:57 +00:00
Jeff Trawick
89c22869f4
remove unused function
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231601 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 00:27:16 +00:00
Lucien Gentis
01ee0e4737
Updates.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231518 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 15:58:59 +00:00
Lucien Gentis
7086a4bac4
Updates.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231510 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 15:01:11 +00:00
Lucien Gentis
e96c8335fe
Update.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231509 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 14:53:49 +00:00
Lucien Gentis
f6cfbf8f26
Update.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231508 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 14:51:08 +00:00
Takashi Sato
9a429c5503
Fix the request/response header error
...
Submitted by: INOUE Seiichiro <inoue ariel-networks.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231446 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 07:33:30 +00:00
Takashi Sato
f0120a87fd
Add svn:keywords LastChangedRevision
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231442 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 06:38:39 +00:00
Eric Covener
5a295bfcee
whitespace only: shift a block refactored in r1231255 over 8 spaces.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231257 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 19:18:03 +00:00
Eric Covener
a9a720a405
*) mod_authnz_ldap: Don't try a potentially expensive nested groups
...
search before exhausting all AuthLDAPGroupAttribute checks on the
current group. PR52464
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231255 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 19:16:50 +00:00
Eric Covener
1d98b89bfb
add compat info to CacheQuickHandler
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1230286 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 22:24:10 +00:00
Joe Orton
65718cf0f5
SECURITY (CVE-2012-0031): Fix possible crash on shutdown if a child
...
changes the sb_type field in the scoreboard. Since unprivileged
children should not be able to affect the parent in this way, this is
treated as a Low severity security issue.
Thanks to "halfdog" <me halfdog.net> for reporting this issue.
* include/scoreboard.h (global_score): Remove sb_type field.
* include/ap_mmn.h: Bump MMN for above.
* server/scoreboard.c (ap_cleanup_scoreboard, ap_create_scoreboard):
Use a static global to store store the scoreboard type.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1230065 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 14:33:47 +00:00
Roy T. Fielding
036e5528c6
More registered media types
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229930 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 08:29:46 +00:00
Takashi Sato
dae01b6642
Update transformations
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229222 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 15:55:25 +00:00
Takashi Sato
d8edde6026
Fix English Revisions.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229201 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 15:25:05 +00:00
Stefan Fritsch
3b2b67b26f
Fix cut'n'paster error
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229136 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 13:08:11 +00:00
Stefan Fritsch
75dad9d44f
Rename ap_func_attr_* macros to AP_FN_ATTR_*
...
Add macro for attribute alloc_size on newer gcc's
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229134 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 13:06:18 +00:00
Takashi Sato
d00d15ac35
Add <glossary> to nroff.xsl and revert r1222335 partially.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229116 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 12:41:42 +00:00
Takashi Sato
832c1abbb9
Fix XML validation error.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229099 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 11:47:28 +00:00
Takashi Sato
abd7071de7
Sync with 2.2 branch
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229059 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 08:27:00 +00:00