]>
granicus.if.org Git - apache/log
Stefan Fritsch [Mon, 27 Feb 2012 13:53:27 +0000 (13:53 +0000)]
Merge r1293405:
Fix AddOutputFilterByType brown paper bag crash bug
Initialize pointers, fix off-by-one.
PR: 52755
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1294157 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 27 Feb 2012 13:07:49 +0000 (13:07 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1294138 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 27 Feb 2012 12:28:38 +0000 (12:28 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1294129 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 26 Feb 2012 21:00:50 +0000 (21:00 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293933 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 26 Feb 2012 20:54:32 +0000 (20:54 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293932 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Feb 2012 17:38:35 +0000 (17:38 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293891 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Feb 2012 17:35:47 +0000 (17:35 +0000)]
Backport:
mod_session: Sessions are encoded as application/x-www-form-urlencoded strings,
however we do not handle the encoding of spaces properly. Fixed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293889 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Feb 2012 16:57:17 +0000 (16:57 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293868 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 26 Feb 2012 16:24:21 +0000 (16:24 +0000)]
vote, promote, propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293861 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Feb 2012 14:42:13 +0000 (14:42 +0000)]
Propose sf's fixes, vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293845 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 26 Feb 2012 14:29:22 +0000 (14:29 +0000)]
ap_unescape_urlencoded* for url-encoded data
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293842 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Feb 2012 10:43:20 +0000 (10:43 +0000)]
Backport:
Add a section to the mod_session documentation that better describes how to integrate
applications with mod_session.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293804 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 26 Feb 2012 10:39:06 +0000 (10:39 +0000)]
Example in configuration comment should use a path
consistent with the default configuration.
PR 52715.
Backport from trunk of r1241069 and
1241071 .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293800 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Feb 2012 10:26:58 +0000 (10:26 +0000)]
Propose for backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293798 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 25 Feb 2012 18:26:17 +0000 (18:26 +0000)]
2.4 has been released, update STATUS to reflect that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293662 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 24 Feb 2012 03:16:22 +0000 (03:16 +0000)]
Internal link to the right section.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1293066 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Thu, 23 Feb 2012 17:39:57 +0000 (17:39 +0000)]
Adding french translation for mod_lua
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1292860 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 21 Feb 2012 15:07:30 +0000 (15:07 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1291842 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 21 Feb 2012 15:05:29 +0000 (15:05 +0000)]
Fix a link in the caching guide.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1291841 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 21 Feb 2012 15:02:15 +0000 (15:02 +0000)]
Mention the rewritten Caching Guide.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1291837 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 21 Feb 2012 15:01:05 +0000 (15:01 +0000)]
Mention the CACHE filter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1291833 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 21 Feb 2012 14:38:26 +0000 (14:38 +0000)]
Mention documentation enhancements in 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1291814 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 21 Feb 2012 13:37:20 +0000 (13:37 +0000)]
generated files from r1291774
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1291775 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 21 Feb 2012 13:36:34 +0000 (13:36 +0000)]
merge r1291766 from trunk
apply insufficient TLC, making some improvements to wording
and typography
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1291774 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 20 Feb 2012 15:32:56 +0000 (15:32 +0000)]
Remove duplicate header line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1291315 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 20 Feb 2012 15:22:16 +0000 (15:22 +0000)]
Switch documentation links nconfiguration templates
from trunk to 2.4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1291307 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 18 Feb 2012 18:07:43 +0000 (18:07 +0000)]
Merge r1290823, r1290835:
Mention AllowOverrideList, Define, EC keys, rotatelogs improvements.
Syntax fixes.
Reordering:
Put related changes next to each other
Put modules that only provide services for other modules last
Try to put important changes first
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1290837 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 17 Feb 2012 19:31:54 +0000 (19:31 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1245723 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 17 Feb 2012 19:30:09 +0000 (19:30 +0000)]
Merge r1245717 :
Mention mod_heartmonitor/mod_lbmethod_heartbeat, mod_sed, mod_auth_form,
mod_session.
Remove mod_reqtimeout (already in 2.2), mark mod_lua as experimental.
Mention more mod_rewrite improvements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1245721 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 14 Feb 2012 21:19:43 +0000 (21:19 +0000)]
Merge r1244211:
Make sure the getsfunc_*() functions used by ap_scan_script_header_err*()
NUL-terminate the resulting string, even in case of an error. mod_cgi
and mod_cgid try to log incomplete output from CGI scripts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1244213 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 14 Feb 2012 07:16:45 +0000 (07:16 +0000)]
Fix shell syntax error introduced in r1243670.
Backport of r1243797 and r1243799 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1243800 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Feb 2012 02:56:52 +0000 (02:56 +0000)]
Removes references to how things used to be in 2.0.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1243770 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 13 Feb 2012 20:02:01 +0000 (20:02 +0000)]
Fix out of tree build using apr and apr-util in srclib.
Also rephrase remaining mentioning of the deps package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1243670 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 13 Feb 2012 13:37:55 +0000 (13:37 +0000)]
And we are 2.4.2-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1243504 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 13 Feb 2012 13:33:46 +0000 (13:33 +0000)]
Get ready to tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1243502 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 13 Feb 2012 13:32:31 +0000 (13:32 +0000)]
Some cleanup... still a LOT to do, but...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1243501 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 13 Feb 2012 03:26:41 +0000 (03:26 +0000)]
backport r1243404
missing modules/ folders in lbmethod modules Loadfile section
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1243405 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 12 Feb 2012 12:46:14 +0000 (12:46 +0000)]
merge r1243246 from trunk:
Fix regression introduced in r1222917: in ssl_find_vhost(), we must use
the *new* SSL_CTX settings for the SSL_set_options/SSL_set_verify calls.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1243247 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 11 Feb 2012 23:00:36 +0000 (23:00 +0000)]
BZ 52623: Fix building against PCRE 8.30.
PCRE dropped support for pcre_info() which is
deprecated since a long time. Use pcre_fullinfo()
instead, which exists since version 3.0 of PCRE.
Patch provided by Ruediger Pluem.
Backport of r1243176 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1243177 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 10 Feb 2012 22:47:04 +0000 (22:47 +0000)]
Fix spelling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1242968 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 10 Feb 2012 21:24:30 +0000 (21:24 +0000)]
enter manpage section assignment to property file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1242931 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 10 Feb 2012 21:21:56 +0000 (21:21 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1242930 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 10 Feb 2012 21:17:10 +0000 (21:17 +0000)]
fix validation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1242928 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 10 Feb 2012 21:14:03 +0000 (21:14 +0000)]
fixup properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1242925 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Feb 2012 20:26:51 +0000 (20:26 +0000)]
Remove repeated word
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1242506 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Feb 2012 19:47:41 +0000 (19:47 +0000)]
Rebuild xdoc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1242486 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Feb 2012 19:43:35 +0000 (19:43 +0000)]
Replace occurences of Apache with Apache httpd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1242481 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Feb 2012 19:42:23 +0000 (19:42 +0000)]
Trivial typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1242480 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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