]> granicus.if.org Git - apache/log
apache
12 years agoxforms
Jim Jagielski [Thu, 9 Feb 2012 15:13:41 +0000 (15:13 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1242357 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1242351 from trunk:
Jim Jagielski [Thu, 9 Feb 2012 15:09:00 +0000 (15:09 +0000)]
Merge r1242351 from trunk:

Handle cases, esp when using mod_proxy_fcgi, when we do not
want SCRIPT_FILENAME to include the query string.
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1242354 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdd cleanup for SSLProxyMachineCertificateChainFile during init
Daniel Ruggeri [Wed, 8 Feb 2012 21:11:54 +0000 (21:11 +0000)]
Add cleanup for SSLProxyMachineCertificateChainFile during init

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1242097 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpgrading...
Jim Jagielski [Wed, 8 Feb 2012 16:14:57 +0000 (16:14 +0000)]
Upgrading...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1241958 13f79535-47bb-0310-9956-ffa450edef68

12 years agoxfers
Jim Jagielski [Wed, 8 Feb 2012 16:09:15 +0000 (16:09 +0000)]
xfers

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1241956 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBuild instruct updates
Jim Jagielski [Wed, 8 Feb 2012 16:07:19 +0000 (16:07 +0000)]
Build instruct updates

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1241955 13f79535-47bb-0310-9956-ffa450edef68

12 years agoremove -deps info from INSTALL
Jim Jagielski [Wed, 8 Feb 2012 16:01:34 +0000 (16:01 +0000)]
remove -deps info from INSTALL

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1241953 13f79535-47bb-0310-9956-ffa450edef68

12 years agoCorrect the --with_included_apr error message. We no longer provide
Jim Jagielski [Wed, 8 Feb 2012 13:48:19 +0000 (13:48 +0000)]
Correct the --with_included_apr error message. We no longer provide
an included/bundled version of apr/apu for the convenience of
our users.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1241897 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFixes example in httpd.conf, as per bug 52604
Rich Bowen [Mon, 6 Feb 2012 16:55:22 +0000 (16:55 +0000)]
Fixes example in httpd.conf, as per bug 52604

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1241076 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport:
Graham Leggett [Sun, 5 Feb 2012 19:26:15 +0000 (19:26 +0000)]
Backport:
aix: Add a set of build scripts that make packages suitable for installp
on the AIX platform.
Submitted by: Michael Felt <mamfelt gmail com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1240780 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdd CHANGES entry
Stefan Fritsch [Sat, 4 Feb 2012 10:10:50 +0000 (10:10 +0000)]
Add CHANGES entry
two known issues gone

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1240480 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1235019, r1236122, r1240470:
Stefan Fritsch [Sat, 4 Feb 2012 10:04:59 +0000 (10:04 +0000)]
Merge r1235019, r1236122, r1240470:

    Make the core input/output filter contexts private and provide a hook
    to insert a custom bucket, for use bye mpm_winnt and mod_ftp.

    This allows to add members to the context structs without breaking binary
    compatibility.

This should be ABI back-compatible, so only a minor MMN bump.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1240478 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1240315:
Stefan Fritsch [Fri, 3 Feb 2012 19:59:26 +0000 (19:59 +0000)]
Merge r1240315:
Fix various filter functions to return apr_status_t instead of int

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1240320 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport fix for PR52402 from trunk
Mladen Turk [Fri, 3 Feb 2012 14:15:59 +0000 (14:15 +0000)]
Backport fix for PR52402 from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1240183 13f79535-47bb-0310-9956-ffa450edef68

12 years agooops, this got forgotten when copy/paste from dev branch
Mladen Turk [Fri, 3 Feb 2012 13:52:46 +0000 (13:52 +0000)]
oops, this got forgotten when copy/paste from dev branch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1240170 13f79535-47bb-0310-9956-ffa450edef68

12 years agoC/C++ 101 on how to traverse the array of pointers ;). Fix core
Mladen Turk [Fri, 3 Feb 2012 13:49:33 +0000 (13:49 +0000)]
C/C++ 101 on how to traverse the array of pointers ;). Fix core

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1240167 13f79535-47bb-0310-9956-ffa450edef68

12 years agos/Apache/Apache httpd/.
Rich Bowen [Fri, 3 Feb 2012 01:59:21 +0000 (01:59 +0000)]
s/Apache/Apache httpd/.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239979 13f79535-47bb-0310-9956-ffa450edef68

12 years agoRebuilds other recent changes.
Rich Bowen [Thu, 2 Feb 2012 14:23:56 +0000 (14:23 +0000)]
Rebuilds other recent changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239641 13f79535-47bb-0310-9956-ffa450edef68

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239640 13f79535-47bb-0310-9956-ffa450edef68

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239638 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport:
Graham Leggett [Thu, 2 Feb 2012 12:05:28 +0000 (12:05 +0000)]
Backport:
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/branches/2.4.x@1239567 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1239174 from trunk:
Jim Jagielski [Wed, 1 Feb 2012 19:15:22 +0000 (19:15 +0000)]
Merge r1239174 from trunk:

Document AllowOverride Nonfatal option

Submitted by: niq
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239274 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAlign 2.4 w/ trunk... since 2.4.0 was never released, API change is OK.
Jim Jagielski [Wed, 1 Feb 2012 13:36:37 +0000 (13:36 +0000)]
Align 2.4 w/ trunk... since 2.4.0 was never released, API change is OK.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239125 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1233882 from trunk:
Jim Jagielski [Wed, 1 Feb 2012 13:27:59 +0000 (13:27 +0000)]
Merge r1233882 from trunk:

* 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.

Submitted by: jorton
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239122 13f79535-47bb-0310-9956-ffa450edef68

12 years agoImprove Lua 5.2.0 compatibility.
Rainer Jung [Wed, 1 Feb 2012 13:17:46 +0000 (13:17 +0000)]
Improve Lua 5.2.0 compatibility.

This is not yet complete. Building should
still work with Lua 5.1.4, but needs
-DLUA_COMPAT_ALL in CPPFLAGS when compiled
against 5.2.0. Automatically handling
this in configure is still a TODO.

Backport from trunk of the following revisions:

r1221205: Make mod_lua compile with lua 5.2.x.
MOdified patch submitted by NormW (nornw gknw net).

r1239029: 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.

r1239030: Remove luaL_reg macro definition no longer needed
and simplify lua_load compatibility macro.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239120 13f79535-47bb-0310-9956-ffa450edef68

12 years agoNo need for multi-version compatibility.
Rainer Jung [Wed, 1 Feb 2012 11:13:12 +0000 (11:13 +0000)]
No need for multi-version compatibility.

Backport of r1239071 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239074 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUm. I'm sorry. That's the wrong spot.
Rich Bowen [Wed, 1 Feb 2012 03:47:28 +0000 (03:47 +0000)]
Um. I'm sorry. That's the wrong spot.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238929 13f79535-47bb-0310-9956-ffa450edef68

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238926 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/branches/2.4.x@1238908 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFix handling of piped, syslog, or inherited ErrorLog entries
Rainer Jung [Tue, 31 Jan 2012 22:31:36 +0000 (22:31 +0000)]
Fix handling of piped, syslog, or inherited ErrorLog entries

Backport of r1225223 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238833 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1225199:
Stefan Fritsch [Tue, 31 Jan 2012 21:50:03 +0000 (21:50 +0000)]
Merge r1225199:
Check during configtest that the directories for error logs exist

PR: 29941

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238824 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1234899:
Stefan Fritsch [Tue, 31 Jan 2012 21:45:29 +0000 (21:45 +0000)]
Merge r1234899:

    * 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.

Submitted by: Joe Orton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238822 13f79535-47bb-0310-9956-ffa450edef68

12 years agoI think this was fixed by Stefan in r1234646.
Rainer Jung [Tue, 31 Jan 2012 21:21:43 +0000 (21:21 +0000)]
I think this was fixed by Stefan in r1234646.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238817 13f79535-47bb-0310-9956-ffa450edef68

12 years agozap an unhelpful, out of date comment from httpd 1.2
Rainer Jung [Tue, 31 Jan 2012 20:49:45 +0000 (20:49 +0000)]
zap an unhelpful, out of date comment from httpd 1.2

Backport of r1213391 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238806 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFix broken backport of r1232630.
Rainer Jung [Tue, 31 Jan 2012 20:47:44 +0000 (20:47 +0000)]
Fix broken backport of r1232630.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238803 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFix typos
Rainer Jung [Tue, 31 Jan 2012 20:43:44 +0000 (20:43 +0000)]
Fix typos

Backport of r1210148 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238801 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFurther sync docs with trunk.
Rainer Jung [Tue, 31 Jan 2012 20:41:53 +0000 (20:41 +0000)]
Further sync docs with trunk.

I haven't backported docs for the cache-invalidate
env var, since although it is present in 2.4.x
the functionality around it was removed for future
definition, so I guess it is not really useful
right now.

Please correct me if tha is wrong and we should
add the cache-invalidate to the 2.4.x docs
like we have right now in trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238800 13f79535-47bb-0310-9956-ffa450edef68

12 years agoNo longer trunk here.
Rainer Jung [Tue, 31 Jan 2012 20:22:25 +0000 (20:22 +0000)]
No longer trunk here.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238786 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate.
Rainer Jung [Tue, 31 Jan 2012 19:48:34 +0000 (19:48 +0000)]
Update.

iBackport of r1234511 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238771 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate.
Rainer Jung [Tue, 31 Jan 2012 19:46:40 +0000 (19:46 +0000)]
Update.

Backport of r1236701 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238770 13f79535-47bb-0310-9956-ffa450edef68

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

Backport of r1238768 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238769 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdates.
Rainer Jung [Tue, 31 Jan 2012 19:39:14 +0000 (19:39 +0000)]
Updates.

Backport of r1210120 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238767 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdates.
Rainer Jung [Tue, 31 Jan 2012 19:35:53 +0000 (19:35 +0000)]
Updates.

Backport of r1231518 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238762 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate.
Rainer Jung [Tue, 31 Jan 2012 19:33:19 +0000 (19:33 +0000)]
Update.

Backport of r1203980 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238760 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdates.
Rainer Jung [Tue, 31 Jan 2012 19:30:37 +0000 (19:30 +0000)]
Updates.

Backport of r1206472 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238758 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate.
Rainer Jung [Tue, 31 Jan 2012 19:27:39 +0000 (19:27 +0000)]
Update.

Backport of r1231508 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238756 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdates.
Rainer Jung [Tue, 31 Jan 2012 19:21:34 +0000 (19:21 +0000)]
Updates.

Backport of r1203714 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238755 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdates.
Rainer Jung [Tue, 31 Jan 2012 19:13:50 +0000 (19:13 +0000)]
Updates.

Backport of r1201450 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238751 13f79535-47bb-0310-9956-ffa450edef68

12 years agofix typo.
Rainer Jung [Tue, 31 Jan 2012 18:54:54 +0000 (18:54 +0000)]
fix typo.
Submitted by: OKANO Takayoshi <kano@na.rim.or.jp>

Backport of r1210067 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238743 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate translation.
Rainer Jung [Tue, 31 Jan 2012 18:51:05 +0000 (18:51 +0000)]
Update translation.

Backport of r1210336 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238742 13f79535-47bb-0310-9956-ffa450edef68

12 years agoDocs fixes backports from trunk:
Rainer Jung [Tue, 31 Jan 2012 18:48:51 +0000 (18:48 +0000)]
Docs fixes backports from trunk:

r1206940: fix typo.  Submitted by: OKANO Takayoshi <kano@na.rim.or.jp>
r1206978: fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238740 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackports from trunk:
Rainer Jung [Tue, 31 Jan 2012 18:20:53 +0000 (18:20 +0000)]
Backports from trunk:

- r1200955: Patch from Luke Meyer, clarifies usage of ProxyPassReverseCookiePath directive. As per bug #51126
- r1200968: A little clarification about variable interpolation, as requested in bug #51125
- r1202453: Fix xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238730 13f79535-47bb-0310-9956-ffa450edef68

12 years agoTypos
Rainer Jung [Tue, 31 Jan 2012 18:07:54 +0000 (18:07 +0000)]
Typos

Backport of r1212872 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238720 13f79535-47bb-0310-9956-ffa450edef68

12 years agoDocument configure change
Rainer Jung [Tue, 31 Jan 2012 18:04:53 +0000 (18:04 +0000)]
Document configure change

Backport of r1200496 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238719 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate mergeinfo.
Rainer Jung [Tue, 31 Jan 2012 18:02:00 +0000 (18:02 +0000)]
Update mergeinfo.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238717 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdates.
Rainer Jung [Tue, 31 Jan 2012 17:54:47 +0000 (17:54 +0000)]
Updates.

Partial backport of r1231510 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238715 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate.
Rainer Jung [Tue, 31 Jan 2012 17:42:06 +0000 (17:42 +0000)]
Update.

Backport of r1215514 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238708 13f79535-47bb-0310-9956-ffa450edef68

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238704 13f79535-47bb-0310-9956-ffa450edef68

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238702 13f79535-47bb-0310-9956-ffa450edef68

12 years ago* modules/filters/mod_proxy_html.c: Fix various code style issues.
Rainer Jung [Tue, 31 Jan 2012 17:36:22 +0000 (17:36 +0000)]
* modules/filters/mod_proxy_html.c: Fix various code style issues.
* Use apr_is* ctype macro wrappers.

Backport of r1200556 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238699 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1229021 from trunk:
Jim Jagielski [Tue, 31 Jan 2012 17:32:50 +0000 (17:32 +0000)]
Merge r1229021 from trunk:

Core configuration: add AllowOverride option to treat syntax
errors in .htaccess as non-fatal.
PR 52439

Submitted by: niq
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238698 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate CHANGES.
Rainer Jung [Tue, 31 Jan 2012 15:12:13 +0000 (15:12 +0000)]
Update CHANGES.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238654 13f79535-47bb-0310-9956-ffa450edef68

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

Backport of r1238545 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238550 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMake doxygen generate (useful) graphs
Rainer Jung [Tue, 31 Jan 2012 13:55:12 +0000 (13:55 +0000)]
Make doxygen generate (useful) graphs

Backport of r1201032 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238533 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFormatting, no functional change.
Rainer Jung [Tue, 31 Jan 2012 13:53:31 +0000 (13:53 +0000)]
Formatting, no functional change.

Backport of r1200702 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238532 13f79535-47bb-0310-9956-ffa450edef68

12 years agoLine ordering. Partial backport of 1221216
Rainer Jung [Tue, 31 Jan 2012 13:48:36 +0000 (13:48 +0000)]
Line ordering. Partial backport of 1221216
from trunk to keep deltas small.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238526 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFixed NetWare install.
Rainer Jung [Tue, 31 Jan 2012 13:45:14 +0000 (13:45 +0000)]
Fixed NetWare install.

Backport of r1201956 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238523 13f79535-47bb-0310-9956-ffa450edef68

12 years agoSimple edit, when 'saved' this will always alphasort anyways
Rainer Jung [Tue, 31 Jan 2012 12:12:43 +0000 (12:12 +0000)]
Simple edit, when 'saved' this will always alphasort anyways

Backport of r1227910 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238430 13f79535-47bb-0310-9956-ffa450edef68

12 years agoReduce code drift: replace r1205569 with
Rainer Jung [Tue, 31 Jan 2012 12:10:39 +0000 (12:10 +0000)]
Reduce code drift: replace r1205569 with
exact merge of 1205568 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238428 13f79535-47bb-0310-9956-ffa450edef68

12 years ago* include/util_varbuf.h: Doxygen tweaks.
Rainer Jung [Tue, 31 Jan 2012 12:07:38 +0000 (12:07 +0000)]
* include/util_varbuf.h: Doxygen tweaks.

Backport of r1211351 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238423 13f79535-47bb-0310-9956-ffa450edef68

12 years ago* modules/: More doxy group fixes.
Rainer Jung [Tue, 31 Jan 2012 12:04:47 +0000 (12:04 +0000)]
* modules/: More doxy group fixes.

Partial backport of ir1211495.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238421 13f79535-47bb-0310-9956-ffa450edef68

12 years ago* include/httpd.h, server/mpm/*/*.h: Tidy up doxygen tree view by moving
Rainer Jung [Tue, 31 Jan 2012 12:02:05 +0000 (12:02 +0000)]
* include/httpd.h, server/mpm/*/*.h: Tidy up doxygen tree view by moving
  private interfaces into a separate group.

Backport of r1211490 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238416 13f79535-47bb-0310-9956-ffa450edef68

12 years agoinclude/: Various doxy markup tweaks.
Rainer Jung [Tue, 31 Jan 2012 11:58:02 +0000 (11:58 +0000)]
include/: Various doxy markup tweaks.

Backport of r1211364 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238409 13f79535-47bb-0310-9956-ffa450edef68

12 years agodefinAtely
Rainer Jung [Tue, 31 Jan 2012 11:53:02 +0000 (11:53 +0000)]
definAtely

Backport of r1213381 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238407 13f79535-47bb-0310-9956-ffa450edef68

12 years agosilly indentation fix
Rainer Jung [Tue, 31 Jan 2012 11:51:25 +0000 (11:51 +0000)]
silly indentation fix

Backport of r1203400 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238406 13f79535-47bb-0310-9956-ffa450edef68

12 years agos/insure/ensure/
Rainer Jung [Tue, 31 Jan 2012 11:46:48 +0000 (11:46 +0000)]
s/insure/ensure/

Backport of r1237407 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238403 13f79535-47bb-0310-9956-ffa450edef68

12 years agoconfigure: Move the --with-included-apr check so that srcdir!=builddir builds
Rainer Jung [Tue, 31 Jan 2012 11:42:32 +0000 (11:42 +0000)]
configure: Move the --with-included-apr check so that srcdir!=builddir builds
aren't broken by it.

Backport of r1232838 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238400 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1236350 from trunk:
Jim Jagielski [Thu, 26 Jan 2012 19:15:41 +0000 (19:15 +0000)]
Merge r1236350 from trunk:

https also needs QS

Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1236351 13f79535-47bb-0310-9956-ffa450edef68

12 years agoRestore attribution
Stefan Fritsch [Wed, 25 Jan 2012 20:28:50 +0000 (20:28 +0000)]
Restore attribution

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1235916 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdd reference to CVE-2012-0021, quoting the 2.3.x version in which
Jeff Trawick [Wed, 25 Jan 2012 20:06:07 +0000 (20:06 +0000)]
Add reference to CVE-2012-0021, quoting the 2.3.x version in which
the problem was introduced.

(following r1235875 which DidTRT for 2.2.x/CHANGES)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1235894 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate xforms
Jim Jagielski [Mon, 23 Jan 2012 16:51:31 +0000 (16:51 +0000)]
Update xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234895 13f79535-47bb-0310-9956-ffa450edef68

12 years agoSome doc updates
Jim Jagielski [Mon, 23 Jan 2012 16:44:52 +0000 (16:44 +0000)]
Some doc updates

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234890 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1234876:
Stefan Fritsch [Mon, 23 Jan 2012 16:16:55 +0000 (16:16 +0000)]
Merge r1234876:
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/branches/2.4.x@1234878 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1234848 from trunk:
Joe Orton [Mon, 23 Jan 2012 15:24:46 +0000 (15:24 +0000)]
Merge r1234848 from trunk:

* 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/branches/2.4.x@1234854 13f79535-47bb-0310-9956-ffa450edef68

12 years agoSECURITY: CVE-2012-0053 (cve.mitre.org) Fix an issue in error responses that
Eric Covener [Mon, 23 Jan 2012 15:05:08 +0000 (15:05 +0000)]
SECURITY: CVE-2012-0053 (cve.mitre.org) 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/branches/2.4.x@1234838 13f79535-47bb-0310-9956-ffa450edef68

12 years agoremove mistakenly commited patches...
Jim Jagielski [Mon, 23 Jan 2012 11:58:30 +0000 (11:58 +0000)]
remove mistakenly commited patches...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234755 13f79535-47bb-0310-9956-ffa450edef68

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234647 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1234643:
Stefan Fritsch [Sun, 22 Jan 2012 23:31:49 +0000 (23:31 +0000)]
Merge r1234643:
Fix docs for Include, add docs for IncludeOptional

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234646 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1234642:
Stefan Fritsch [Sun, 22 Jan 2012 23:30:14 +0000 (23:30 +0000)]
Merge r1234642:
Add a validate-xml target

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234645 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1234574:
Stefan Fritsch [Sun, 22 Jan 2012 18:52:37 +0000 (18:52 +0000)]
Merge r1234574:

ctx->bytes_in is never used. Remove a useless iteration through the brigade

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234576 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1234479:
Stefan Fritsch [Sun, 22 Jan 2012 18:51:29 +0000 (18:51 +0000)]
Merge r1234479:
Document the rather surprising code path on Windows

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234575 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1234180, r1234297, r1234565:
Stefan Fritsch [Sun, 22 Jan 2012 18:34:56 +0000 (18:34 +0000)]
Merge r1234180, r1234297, r1234565:

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
  mod_cache_disk requires mod_cache
  mod_heartbeat requires mod_watchdog

PR: 52487

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234570 13f79535-47bb-0310-9956-ffa450edef68

12 years agoOne more issue
Stefan Fritsch [Sun, 22 Jan 2012 18:13:14 +0000 (18:13 +0000)]
One more issue

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234564 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate copyrights for externally visible and changed code
Jim Jagielski [Sat, 21 Jan 2012 14:38:25 +0000 (14:38 +0000)]
Update copyrights for externally visible and changed code

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234336 13f79535-47bb-0310-9956-ffa450edef68

12 years agoThese deserve their place in httpd.conf on Windows
Gregg Lewis Smith [Sat, 21 Jan 2012 09:08:56 +0000 (09:08 +0000)]
These deserve their place in httpd.conf on Windows

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234291 13f79535-47bb-0310-9956-ffa450edef68

12 years ago- Note new issues
Stefan Fritsch [Fri, 20 Jan 2012 19:02:53 +0000 (19:02 +0000)]
- Note new issues
- Module documentation is acceptable now

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1234075 13f79535-47bb-0310-9956-ffa450edef68

12 years agodoc change
Jim Jagielski [Fri, 20 Jan 2012 13:02:28 +0000 (13:02 +0000)]
doc change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1233887 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1233604 from trunk:
Jeff Trawick [Thu, 19 Jan 2012 22:41:55 +0000 (22:41 +0000)]
Merge r1233604 from trunk:

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/branches/2.4.x@1233619 13f79535-47bb-0310-9956-ffa450edef68

12 years agoadd entry for r1179239 (CVE-2011-3368)
Jeff Trawick [Thu, 19 Jan 2012 22:32:09 +0000 (22:32 +0000)]
add entry for r1179239 (CVE-2011-3368)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1233611 13f79535-47bb-0310-9956-ffa450edef68

12 years agoadd entry for r1209436 (CVE-2011-4317)
Jeff Trawick [Thu, 19 Jan 2012 22:29:21 +0000 (22:29 +0000)]
add entry for r1209436 (CVE-2011-4317)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1233609 13f79535-47bb-0310-9956-ffa450edef68