]> granicus.if.org Git - apache/log
apache
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

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

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

12 years agoMerge r1232594:
Stefan Fritsch [Tue, 17 Jan 2012 21:43:25 +0000 (21:43 +0000)]
Merge r1232594:
Reword the paragraph about --with-included-apr to mention the -deps
tarball.

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

12 years agoThis is 2.4, not 2.3. And it's not a development version anymore.
Stefan Fritsch [Tue, 17 Jan 2012 21:35:34 +0000 (21:35 +0000)]
This is 2.4, not 2.3. And it's not a development version anymore.

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

12 years agoBackport:
Graham Leggett [Tue, 17 Jan 2012 21:17:24 +0000 (21:17 +0000)]
Backport:
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/branches/2.4.x@1232576 13f79535-47bb-0310-9956-ffa450edef68

12 years agoreformat CVE-2012-0031 to make consistent with other CVEs
Eric Covener [Tue, 17 Jan 2012 14:08:41 +0000 (14:08 +0000)]
reformat CVE-2012-0031 to make consistent with other CVEs

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

12 years agoBackport:
Graham Leggett [Mon, 16 Jan 2012 23:21:40 +0000 (23:21 +0000)]
Backport:
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/branches/2.4.x@1232226 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAnd we are at 2.4.1-dev
Jim Jagielski [Mon, 16 Jan 2012 17:35:39 +0000 (17:35 +0000)]
And we are at 2.4.1-dev

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

12 years agoGet ready to tag 2.4.0
Jim Jagielski [Mon, 16 Jan 2012 17:33:56 +0000 (17:33 +0000)]
Get ready to tag 2.4.0

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

12 years agoUpdate xforms, add missing mod_watchdog generated files
Stefan Fritsch [Sun, 15 Jan 2012 22:47:37 +0000 (22:47 +0000)]
Update xforms, add missing mod_watchdog generated files

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

12 years agoMerge r1229930:
Stefan Fritsch [Sun, 15 Jan 2012 22:35:13 +0000 (22:35 +0000)]
Merge r1229930:

More registered media types

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

12 years agogenerated html and revision numbers
Jeff Trawick [Sun, 15 Jan 2012 02:05:18 +0000 (02:05 +0000)]
generated html and revision numbers

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

12 years agomerge r1231607 from trunk
Jeff Trawick [Sun, 15 Jan 2012 02:04:16 +0000 (02:04 +0000)]
merge r1231607 from trunk

Submitted by: Daniel Shahaf

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

12 years agoMerge r1231446from trunk:
Takashi Sato [Sat, 14 Jan 2012 07:47:09 +0000 (07:47 +0000)]
Merge r1231446from trunk:

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

12 years agoMerge r1229099 and r1231442 from trunk:
Takashi Sato [Sat, 14 Jan 2012 06:49:17 +0000 (06:49 +0000)]
Merge r1229099 and r1231442 from trunk:

Fix XML validation error.
Add svn:keywords LastChangedRevision

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

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

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

12 years agoconnect some the dots to 'CacheQuickHandler' in the CHANGES entry.
Eric Covener [Wed, 11 Jan 2012 22:21:24 +0000 (22:21 +0000)]
connect some the dots to 'CacheQuickHandler' in the CHANGES entry.

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

12 years agoMerge r1230065 from trunk (adapted to avoid MMN change):
Joe Orton [Wed, 11 Jan 2012 14:45:02 +0000 (14:45 +0000)]
Merge r1230065 from trunk (adapted to avoid MMN change):

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.

* server/scoreboard.c (ap_cleanup_scoreboard, ap_create_scoreboard):
  Use a static global to store an authoritative copy of the scoreboard
  type.

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

12 years agoxforms
Jim Jagielski [Mon, 9 Jan 2012 17:03:50 +0000 (17:03 +0000)]
xforms

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

12 years agoBackport documentation updates for mod_heartbeat, mod_heartmonitor and mod_watchdog
Sander Temme [Mon, 9 Jan 2012 16:34:24 +0000 (16:34 +0000)]
Backport documentation updates for mod_heartbeat, mod_heartmonitor and mod_watchdog

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

12 years agoMerge r1229116 from trunk:
Takashi Sato [Mon, 9 Jan 2012 16:07:37 +0000 (16:07 +0000)]
Merge r1229116 from trunk:

Add <glossary> to nroff.xsl and revert r1222335(r1222355) partially.

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

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

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

12 years agoMerge r1229134, r1229136:
Stefan Fritsch [Mon, 9 Jan 2012 13:18:26 +0000 (13:18 +0000)]
Merge r1229134, r1229136:

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

12 years agoMerge r1229059 from trunk:
Takashi Sato [Mon, 9 Jan 2012 09:49:19 +0000 (09:49 +0000)]
Merge r1229059 from trunk:

Sync with 2.2 branch

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