]> granicus.if.org Git - apache/log
apache
12 years agoTypo correction. Rebuild xhtml transformation
Rich Bowen [Fri, 3 Feb 2012 01:54:42 +0000 (01:54 +0000)]
Typo correction. Rebuild xhtml transformation

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

12 years agoTypo correction - s/Availabe/Available/
Rich Bowen [Fri, 3 Feb 2012 01:52:01 +0000 (01:52 +0000)]
Typo correction - s/Availabe/Available/

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

12 years agoxforms
Eric Covener [Thu, 2 Feb 2012 21:52:12 +0000 (21:52 +0000)]
xforms

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

12 years agorevert "overloaded" recent additions to mod_rewrite
Eric Covener [Thu, 2 Feb 2012 21:51:36 +0000 (21:51 +0000)]
revert "overloaded" recent additions to mod_rewrite

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

12 years agoxforms
Eric Covener [Thu, 2 Feb 2012 19:31:44 +0000 (19:31 +0000)]
xforms

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

12 years agodocument a small trunk-only mod_rewrite indulgence
Eric Covener [Thu, 2 Feb 2012 19:31:01 +0000 (19:31 +0000)]
document a small trunk-only mod_rewrite indulgence

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

12 years agobump
Eric Covener [Thu, 2 Feb 2012 15:57:51 +0000 (15:57 +0000)]
bump

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

12 years agoadd an internal sleep map function that expands to an empty string.
Eric Covener [Thu, 2 Feb 2012 15:51:09 +0000 (15:51 +0000)]
add an internal sleep map function that expands to an empty string.

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

12 years agotreat a rewriterule substitution that expands to "-" as if the rule
Eric Covener [Thu, 2 Feb 2012 15:43:41 +0000 (15:43 +0000)]
treat a rewriterule substitution that expands to "-" as if the rule
had a literal "-".

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

12 years agoRebuilds various other modifications from the last few days.
Rich Bowen [Thu, 2 Feb 2012 14:17:06 +0000 (14:17 +0000)]
Rebuilds various other modifications from the last few days.

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

12 years agoRebuild html
Rich Bowen [Thu, 2 Feb 2012 14:16:10 +0000 (14:16 +0000)]
Rebuild html

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

12 years agoTypo fix, courtesy of humbedooh AT humbedooh.com - Daniel Gruno
Rich Bowen [Thu, 2 Feb 2012 14:14:00 +0000 (14:14 +0000)]
Typo fix, courtesy of humbedooh AT humbedooh.com - Daniel Gruno

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

12 years agoAdd a configuration layout for the AIX platform.
Graham Leggett [Thu, 2 Feb 2012 12:02:54 +0000 (12:02 +0000)]
Add a configuration layout for the AIX platform.
Submitted by: Michael Felt <mamfelt gmail com>

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

12 years agoDocument AllowOverride Nonfatal option
Nick Kew [Wed, 1 Feb 2012 15:40:03 +0000 (15:40 +0000)]
Document AllowOverride Nonfatal option

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

12 years agoFix parallel installation for static modules
Rainer Jung [Wed, 1 Feb 2012 11:16:34 +0000 (11:16 +0000)]
Fix parallel installation for static modules
builds. When "$(shared)" was empty, instdso.sh
complained with a Usage message.

Don't call instdso, if there's nothing to install.

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

12 years agoForgot to bump MMN when advancing the
Rainer Jung [Wed, 1 Feb 2012 11:12:02 +0000 (11:12 +0000)]
Forgot to bump MMN when advancing the
MODULE_MAGIC_COOKIE for trunk.

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

12 years agoNo need for multi-version compatibility.
Rainer Jung [Wed, 1 Feb 2012 11:08:59 +0000 (11:08 +0000)]
No need for multi-version compatibility.
Broke trunk, because the COOKIE was advanced
to "AP25".

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

12 years agoNote a TODO for Lua 5.2.0 compatibility.
Rainer Jung [Wed, 1 Feb 2012 09:54:25 +0000 (09:54 +0000)]
Note a TODO for Lua 5.2.0 compatibility.

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

12 years agoRemove luaL_reg macro definition no longer needed
Rainer Jung [Wed, 1 Feb 2012 09:51:59 +0000 (09:51 +0000)]
Remove luaL_reg macro definition no longer needed
and simplify lua_load compatibility macro.

Note that in order to successfully compile with
Lua 5.2.0 we still need to add LUA_COMPAT_ALL
to CPPFLAGS. Detection in config.m4 is still
missing.

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

12 years agoluaL_reg was already deprecated in Lua 5.1.4.
Rainer Jung [Wed, 1 Feb 2012 09:50:14 +0000 (09:50 +0000)]
luaL_reg was already deprecated in Lua 5.1.4.
It is gone in Lua 5.2.0 and was replaced by luaL_Reg
which already existed in 5.1.4. So use that one..

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

12 years agoMinor fixes for firehose and mod_policy:
Rainer Jung [Wed, 1 Feb 2012 09:47:53 +0000 (09:47 +0000)]
Minor fixes for firehose and mod_policy:
- err.h does not exist in Solaris. Judging
  from the expected content of err.h we don't
  use it at all, so remove inclusion of it.
- The name DEFAULT_TYPE is to generic. Use
  POLICY_DEFAULT_TYPE instead.
- Include apr header files from configured
  path instead of system path.

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

12 years agoAddition to r1237447: "for arg ; do" is not
Rainer Jung [Wed, 1 Feb 2012 09:45:12 +0000 (09:45 +0000)]
Addition to r1237447: "for arg ; do" is not
sh standard. It seems its a shortcut for
"for arg in "$@" ; do".

Detected on Solaris with very restricted /bin/sh.

Seems to work fine for arguments with embedded
whitespace.

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

12 years agoAdd a few placeholders to CHANGES for items which
Rainer Jung [Wed, 1 Feb 2012 07:50:42 +0000 (07:50 +0000)]
Add a few placeholders to CHANGES for items which
are currrently trunk only.

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

12 years agoSorry about that. Wasnt looking in the right place.
Rich Bowen [Wed, 1 Feb 2012 03:49:14 +0000 (03:49 +0000)]
Sorry about that. Wasnt looking in the right place.

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

12 years agoMake apachectl -h aware of status, fullstatus, and configtest.
Rich Bowen [Wed, 1 Feb 2012 03:31:50 +0000 (03:31 +0000)]
Make apachectl -h aware of status, fullstatus, and configtest.

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

12 years agoFixed c&p error.
Guenter Knauf [Wed, 1 Feb 2012 02:38:27 +0000 (02:38 +0000)]
Fixed c&p error.

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

12 years agoRevert r1202255 to restore same behavior as in 2.4:
Stefan Fritsch [Tue, 31 Jan 2012 21:53:17 +0000 (21:53 +0000)]
Revert r1202255 to restore same behavior as in 2.4:

    disable mod_reqtimeout if not configured

There is some agreement that 2.4's behavior is fine.

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

12 years agoNote some things that should be considered, but not shortly before a release
Stefan Fritsch [Tue, 31 Jan 2012 21:39:05 +0000 (21:39 +0000)]
Note some things that should be considered, but not shortly before a release

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

12 years agoRemove changes from trunk CHANGES that have already
Rainer Jung [Tue, 31 Jan 2012 20:54:22 +0000 (20:54 +0000)]
Remove changes from trunk CHANGES that have already
been backported to 2.4.x.

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

12 years agoFix typo which was already fixed in 2.4.x.
Rainer Jung [Tue, 31 Jan 2012 20:51:11 +0000 (20:51 +0000)]
Fix typo which was already fixed in 2.4.x.

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

12 years agoRemove unwanted tanslation leftover.
Rainer Jung [Tue, 31 Jan 2012 19:43:10 +0000 (19:43 +0000)]
Remove unwanted tanslation leftover.
Was introduced in r1210120.

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

12 years agoupdate for sync with English docs.
Rainer Jung [Tue, 31 Jan 2012 19:04:59 +0000 (19:04 +0000)]
update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

Forward port of r1221304 from 2.4.x.

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

12 years agoupdate for sync with English docs.
Rainer Jung [Tue, 31 Jan 2012 18:59:30 +0000 (18:59 +0000)]
update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

Forward port of r1215501 from 2.4.x.

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

12 years agoSync docs with 2.4.x.
Rainer Jung [Tue, 31 Jan 2012 18:38:02 +0000 (18:38 +0000)]
Sync docs with 2.4.x.

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

12 years agoSome doc updates
Rainer Jung [Tue, 31 Jan 2012 18:13:52 +0000 (18:13 +0000)]
Some doc updates

Forward port of r1234890 from 2.4.x.

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

12 years agoxforms
Jim Jagielski [Tue, 31 Jan 2012 17:38:36 +0000 (17:38 +0000)]
xforms

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

12 years agoc/p error
Jim Jagielski [Tue, 31 Jan 2012 17:37:08 +0000 (17:37 +0000)]
c/p error

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

12 years agoDocco r1229021
Jim Jagielski [Tue, 31 Jan 2012 16:53:27 +0000 (16:53 +0000)]
Docco r1229021

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

12 years agoFix copy&paste error in comment.
Rainer Jung [Tue, 31 Jan 2012 14:00:14 +0000 (14:00 +0000)]
Fix copy&paste error in comment.

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

12 years agoI guess that makes sense.
Rainer Jung [Tue, 31 Jan 2012 13:51:03 +0000 (13:51 +0000)]
I guess that makes sense.

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

12 years agoAdd event MPM description.
Rainer Jung [Tue, 31 Jan 2012 11:49:34 +0000 (11:49 +0000)]
Add event MPM description.

Partial forward port of r1201214 from 2.4.x.

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

12 years agoiThese deserve their place in httpd.conf on Windows
Rainer Jung [Tue, 31 Jan 2012 11:45:18 +0000 (11:45 +0000)]
iThese deserve their place in httpd.conf on Windows

Foreward port of r1234291 from 2.4.x.

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

12 years agoUpdate copyrights for externally visible and changed code
Rainer Jung [Tue, 31 Jan 2012 11:38:22 +0000 (11:38 +0000)]
Update copyrights for externally visible and changed code

Forward port of r1234336 from 2.4.x.

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

12 years agoInstall multiple files per install.sh invocation
Stefan Fritsch [Sun, 29 Jan 2012 20:11:55 +0000 (20:11 +0000)]
Install multiple files per install.sh invocation

Libtool and BSD install support installing several files in one run.
Add support to install.sh and instdso.sh, too.
Replace for-loops in the Makefiles.

This reduces 'make install' time by approx. 50% because we save
lots of calls to the huge libtool shell script.

The AIX-specific magic in instdso.sh could use some testing.

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

12 years agos/insure/ensure/
Jeff Trawick [Sun, 29 Jan 2012 18:22:35 +0000 (18:22 +0000)]
s/insure/ensure/

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

12 years agoUpdate.
Lucien Gentis [Fri, 27 Jan 2012 14:51:24 +0000 (14:51 +0000)]
Update.

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

12 years agohttps also needs QS
Jim Jagielski [Thu, 26 Jan 2012 19:14:58 +0000 (19:14 +0000)]
https also needs QS

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

12 years ago* Don't typedef twice (in .c and .h file).
Ruediger Pluem [Thu, 26 Jan 2012 10:03:36 +0000 (10:03 +0000)]
* 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

12 years agoMake the core input/output filter contexts private and provide accessor APIs
Stefan Fritsch [Mon, 23 Jan 2012 21:58:42 +0000 (21:58 +0000)]
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

12 years ago* server/core_filters.c (send_brigade_nonblocking): Use a non-blocking
Joe Orton [Mon, 23 Jan 2012 16:57:07 +0000 (16:57 +0000)]
* 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

12 years agoDocument how Include should behave. The present inconsistencies are now subject
Stefan Fritsch [Mon, 23 Jan 2012 16:13:08 +0000 (16:13 +0000)]
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

12 years ago* server/core_filters.c (ap_core_output_filter): Don't read the entire
Joe Orton [Mon, 23 Jan 2012 15:19:07 +0000 (15:19 +0000)]
* 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

12 years agoCVE-2012-0053: Fix an issue in error responses that could expose
Eric Covener [Mon, 23 Jan 2012 15:04:09 +0000 (15:04 +0000)]
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

12 years agoupdate xforms
Stefan Fritsch [Sun, 22 Jan 2012 23:30:02 +0000 (23:30 +0000)]
update xforms

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

12 years agoFix docs for Include, add docs for IncludeOptional
Stefan Fritsch [Sun, 22 Jan 2012 23:26:31 +0000 (23:26 +0000)]
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

12 years agoAdd a validate-xml target
Stefan Fritsch [Sun, 22 Jan 2012 23:19:57 +0000 (23:19 +0000)]
Add a validate-xml target

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

12 years agoctx->bytes_in is never used. Remove a useless iteration through the brigade
Stefan Fritsch [Sun, 22 Jan 2012 18:50:21 +0000 (18:50 +0000)]
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

12 years agoImprove indentation, no code change
Stefan Fritsch [Sun, 22 Jan 2012 18:27:11 +0000 (18:27 +0000)]
Improve indentation, no code change

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

12 years agoUpdate.
Lucien Gentis [Sun, 22 Jan 2012 13:27:38 +0000 (13:27 +0000)]
Update.

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

12 years agoDocument the rather surprising code path on Windows
Stefan Fritsch [Sun, 22 Jan 2012 10:48:23 +0000 (10:48 +0000)]
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

12 years agoMore configure time dependencies:
Stefan Fritsch [Sat, 21 Jan 2012 10:26:51 +0000 (10:26 +0000)]
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

12 years agoMake APACHE_MODULE() accept an optional prerequisite module for configure.
Stefan Fritsch [Fri, 20 Jan 2012 22:14:31 +0000 (22:14 +0000)]
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

12 years ago* server/core_filters.c (ap_core_input_filter): Only treat EAGAIN as
Joe Orton [Fri, 20 Jan 2012 12:41:18 +0000 (12:41 +0000)]
* 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

12 years agoAdjust CVE-2011-3368/CVE-2011-4317 fixes to rely solely on
Jeff Trawick [Thu, 19 Jan 2012 22:23:15 +0000 (22:23 +0000)]
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

12 years agoconfigure: Move the --with-included-apr check so that srcdir!=builddir builds
Graham Leggett [Wed, 18 Jan 2012 11:30:27 +0000 (11:30 +0000)]
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

12 years agoAnticipate win32+win64
William A. Rowe Jr [Tue, 17 Jan 2012 22:58:23 +0000 (22:58 +0000)]
Anticipate win32+win64

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

12 years agoService named 2.x on trunk
William A. Rowe Jr [Tue, 17 Jan 2012 22:50:13 +0000 (22:50 +0000)]
Service named 2.x on trunk

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

12 years agoFurther win32 edits anticipating 1.0.1-final is soon
William A. Rowe Jr [Tue, 17 Jan 2012 22:49:16 +0000 (22:49 +0000)]
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

12 years agoReword the paragraph about --with-included-apr to mention the -deps
Stefan Fritsch [Tue, 17 Jan 2012 21:41:24 +0000 (21:41 +0000)]
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

12 years agoTrunk is at 2.5
Stefan Fritsch [Tue, 17 Jan 2012 21:30:22 +0000 (21:30 +0000)]
Trunk is at 2.5

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

12 years agoconfigure: Improve the error message when --with-included-apr is specified
Graham Leggett [Tue, 17 Jan 2012 21:12:19 +0000 (21:12 +0000)]
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

12 years agoRPM: Add mod_bucketeer, mod_case_filter and mod_case_filter_in to the RPM
Graham Leggett [Mon, 16 Jan 2012 23:17:23 +0000 (23:17 +0000)]
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

12 years agoUpdate xforms
Stefan Fritsch [Sun, 15 Jan 2012 22:46:12 +0000 (22:46 +0000)]
Update xforms

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

12 years agogenerated files and revision numbers
Jeff Trawick [Sun, 15 Jan 2012 01:40:32 +0000 (01:40 +0000)]
generated files and revision numbers

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

12 years agofix syntax errors in Mutex examples
Jeff Trawick [Sun, 15 Jan 2012 01:36:45 +0000 (01:36 +0000)]
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

12 years agofix const warning with strchr->ap_strchr mapping
Jeff Trawick [Sun, 15 Jan 2012 00:27:57 +0000 (00:27 +0000)]
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

12 years agoremove unused function
Jeff Trawick [Sun, 15 Jan 2012 00:27:16 +0000 (00:27 +0000)]
remove unused function

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

12 years agoUpdates.
Lucien Gentis [Sat, 14 Jan 2012 15:58:59 +0000 (15:58 +0000)]
Updates.

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

12 years agoUpdates.
Lucien Gentis [Sat, 14 Jan 2012 15:01:11 +0000 (15:01 +0000)]
Updates.

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

12 years agoUpdate.
Lucien Gentis [Sat, 14 Jan 2012 14:53:49 +0000 (14:53 +0000)]
Update.

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

12 years agoUpdate.
Lucien Gentis [Sat, 14 Jan 2012 14:51:08 +0000 (14:51 +0000)]
Update.

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

12 years agoFix the request/response header error
Takashi Sato [Sat, 14 Jan 2012 07:33:30 +0000 (07:33 +0000)]
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

12 years agoAdd svn:keywords LastChangedRevision
Takashi Sato [Sat, 14 Jan 2012 06:38:39 +0000 (06:38 +0000)]
Add svn:keywords LastChangedRevision

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

12 years agowhitespace only: shift a block refactored in r1231255 over 8 spaces.
Eric Covener [Fri, 13 Jan 2012 19:18:03 +0000 (19:18 +0000)]
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

12 years ago *) mod_authnz_ldap: Don't try a potentially expensive nested groups
Eric Covener [Fri, 13 Jan 2012 19:16:50 +0000 (19:16 +0000)]
  *) 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

12 years agoadd compat info to CacheQuickHandler
Eric Covener [Wed, 11 Jan 2012 22:24:10 +0000 (22:24 +0000)]
add compat info to CacheQuickHandler

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

12 years agoSECURITY (CVE-2012-0031): Fix possible crash on shutdown if a child
Joe Orton [Wed, 11 Jan 2012 14:33:47 +0000 (14:33 +0000)]
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

12 years agoMore registered media types
Roy T. Fielding [Wed, 11 Jan 2012 08:29:46 +0000 (08:29 +0000)]
More registered media types

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

12 years agoUpdate transformations
Takashi Sato [Mon, 9 Jan 2012 15:55:25 +0000 (15:55 +0000)]
Update transformations

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

12 years agoFix English Revisions.
Takashi Sato [Mon, 9 Jan 2012 15:25:05 +0000 (15:25 +0000)]
Fix English Revisions.

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

12 years agoFix cut'n'paster error
Stefan Fritsch [Mon, 9 Jan 2012 13:08:11 +0000 (13:08 +0000)]
Fix cut'n'paster error

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

12 years agoRename ap_func_attr_* macros to AP_FN_ATTR_*
Stefan Fritsch [Mon, 9 Jan 2012 13:06:18 +0000 (13:06 +0000)]
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

12 years agoAdd <glossary> to nroff.xsl and revert r1222335 partially.
Takashi Sato [Mon, 9 Jan 2012 12:41:42 +0000 (12:41 +0000)]
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

12 years agoFix XML validation error.
Takashi Sato [Mon, 9 Jan 2012 11:47:28 +0000 (11:47 +0000)]
Fix XML validation error.

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

12 years agoSync with 2.2 branch
Takashi Sato [Mon, 9 Jan 2012 08:27:00 +0000 (08:27 +0000)]
Sync with 2.2 branch

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

12 years agoChanges to mod_heart* docs upon review by rjung
Sander Temme [Mon, 9 Jan 2012 04:20:46 +0000 (04:20 +0000)]
Changes to mod_heart* docs upon review by rjung

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

12 years agoCore configuration: add AllowOverride option to treat syntax
Nick Kew [Mon, 9 Jan 2012 04:01:06 +0000 (04:01 +0000)]
Core configuration: add AllowOverride option to treat syntax
errors in .htaccess as non-fatal.
PR 52439

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

12 years agorewrite guesses URL or Filesystem in server context, but treats everything
Eric Covener [Sun, 8 Jan 2012 16:57:55 +0000 (16:57 +0000)]
rewrite guesses URL or Filesystem in server context, but treats everything
as a URL in per-dir context.

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

12 years agofix signedness issue with SSL_X509_NAME_to_string()'s maxlen argument
Kaspar Brand [Sun, 8 Jan 2012 10:08:19 +0000 (10:08 +0000)]
fix signedness issue with SSL_X509_NAME_to_string()'s maxlen argument

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

12 years agooptimize this... Do strlen() ONLY if we need to check
Jim Jagielski [Sun, 8 Jan 2012 01:40:01 +0000 (01:40 +0000)]
optimize this... Do strlen() ONLY if we need to check
for overflow.

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