]>
granicus.if.org Git - apache/log
Graham Leggett [Sun, 25 Mar 2012 21:27:29 +0000 (21:27 +0000)]
Backport:
core: Fix breakage of Listen directives with MPMs that use a
per-directory config. PR 52904.
Submitted by: sf
Reviewed by: covener, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305145 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:25:45 +0000 (21:25 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305144 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 25 Mar 2012 21:19:54 +0000 (21:19 +0000)]
propose two more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305140 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:11:13 +0000 (21:11 +0000)]
Backport:
core: Disallow directives in AllowOverrideList which are only allowed
in VirtualHost or server context. These are usually not prepared to be
called in .htaccess files.
Submitted by: sf
Reviewed by: covener, druggeri
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305137 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:04:11 +0000 (21:04 +0000)]
Backport:
core: In AllowOverrideList, do not allow 'None' together with other
directives. PR 52823.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305132 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 21:02:46 +0000 (21:02 +0000)]
Remove stray svn:mergeinfo property.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305131 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 20:57:52 +0000 (20:57 +0000)]
Backport:
mod_slotmem_shm: Support DEFAULT_REL_RUNTIMEDIR for file-based shm.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305127 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Mar 2012 20:54:06 +0000 (20:54 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305125 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 25 Mar 2012 20:13:46 +0000 (20:13 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305114 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sun, 25 Mar 2012 16:40:43 +0000 (16:40 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305076 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 12:27:27 +0000 (12:27 +0000)]
more votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305019 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 12:05:39 +0000 (12:05 +0000)]
Submitted by: sf
Reviewed by sf, trawick, druggeri
Merge r1304855 from trunk:
Downgrade log message about adjusted IP address to trace1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305016 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 12:03:30 +0000 (12:03 +0000)]
Submitted by: sf
Reviewed by: sf, trawick, covener
Merge r1304852 from trunk:
Fix merging of AllowOverrideList and ContentDigest.
Remove some useless code.
Pointed out by covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305014 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 11:57:13 +0000 (11:57 +0000)]
Submitted by: covener
Reviewed by: covener, igalic, sf
Merge r1304641 from trunk:
PR52981: mod_request: fix check for bad KeptBodySize argument
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305012 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2012 11:51:08 +0000 (11:51 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1305011 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 25 Mar 2012 07:00:28 +0000 (07:00 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304988 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 25 Mar 2012 06:57:57 +0000 (06:57 +0000)]
Merge r1304985 from trunk:
Mention SSL certificate checks are now enabled by default, as opposed to disabled in 2.2.
Submitted by: Petter Berntsen (petterb@gmail.com)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304987 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 24 Mar 2012 22:43:45 +0000 (22:43 +0000)]
Add vote for remote_ip log change proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304953 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 22:04:49 +0000 (22:04 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304944 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 22:03:06 +0000 (22:03 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304942 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 24 Mar 2012 18:06:53 +0000 (18:06 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304876 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 24 Mar 2012 17:12:24 +0000 (17:12 +0000)]
vote for some simple fixes from sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304866 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 24 Mar 2012 16:49:51 +0000 (16:49 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304856 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 24 Mar 2012 16:35:06 +0000 (16:35 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304853 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 24 Mar 2012 16:17:08 +0000 (16:17 +0000)]
vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304841 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Mar 2012 15:02:41 +0000 (15:02 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304819 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 14:24:06 +0000 (14:24 +0000)]
Rebuilt html.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304807 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 14:22:48 +0000 (14:22 +0000)]
Merge r1304805 from trunk: Fix bad link (again).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304806 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 14:17:37 +0000 (14:17 +0000)]
Rebuild html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304804 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 14:17:23 +0000 (14:17 +0000)]
Merge r1304802 from trunk:
Fix broken link: Should point to 2.0 docs instead of current branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304803 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 13:14:38 +0000 (13:14 +0000)]
Merge r1304784 from trunk and rebuild html: Fixed 19 broken references.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304785 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 12:57:17 +0000 (12:57 +0000)]
Merge r1304780 from trunk and rebuild html:
Typo fix: mod_authnnz_ldap -> mod_authnz_ldap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304781 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 10:04:58 +0000 (10:04 +0000)]
Merge r1304743 from trunk and rebuild html:
Fix references to the new auth modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304745 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 09:48:40 +0000 (09:48 +0000)]
Merge r1303789 from trunk:
fix french translation and rebuild.
Submitted by: humbedooh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304740 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 09:35:05 +0000 (09:35 +0000)]
Rebuild German html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304736 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 09:32:43 +0000 (09:32 +0000)]
Rebuild french html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304735 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 09:06:56 +0000 (09:06 +0000)]
Rebuild html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304733 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 09:02:24 +0000 (09:02 +0000)]
Rebuild core (removed reference to DefaultRuntimeDir)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304732 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 24 Mar 2012 09:00:40 +0000 (09:00 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304731 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sat, 24 Mar 2012 00:58:06 +0000 (00:58 +0000)]
vote, this time, really only vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304690 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sat, 24 Mar 2012 00:57:27 +0000 (00:57 +0000)]
revert r1304688: next time, look at the patch online, maybe..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304689 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sat, 24 Mar 2012 00:43:22 +0000 (00:43 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304688 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 23 Mar 2012 22:48:42 +0000 (22:48 +0000)]
propose mod_request PR52981 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304643 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 23 Mar 2012 13:22:30 +0000 (13:22 +0000)]
Removed outdated question about Netscape Navigator 3 (re English version)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304331 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 23 Mar 2012 13:19:03 +0000 (13:19 +0000)]
Rebuild files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1304329 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 22 Mar 2012 14:58:56 +0000 (14:58 +0000)]
Merge r1303804, r1303805 from trunk (again):
Remove link to outdated (and deleted) question about ssl errors in old browsers.
rebuild html.
Submitted by: humbedooh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1303823 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 22 Mar 2012 14:46:58 +0000 (14:46 +0000)]
Merge r1303804, r1303805 from trunk:
Remove link to outdated (and deleted) question about ssl errors in old browsers.
rebuild html.
Submitted by: humbedooh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1303814 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 22 Mar 2012 13:52:19 +0000 (13:52 +0000)]
Fix french translation and rebuild for fr, en (re r1303783).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1303785 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 22 Mar 2012 13:51:11 +0000 (13:51 +0000)]
Fix broken reference: Require belongs to mod_authz_core, not core.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1303783 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 22 Mar 2012 13:45:00 +0000 (13:45 +0000)]
mod_autoindex.html.en: rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1303779 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 22 Mar 2012 13:42:36 +0000 (13:42 +0000)]
mod_autoindex.xml: Point to mod_autoindex instead of autoindex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1303776 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 22 Mar 2012 03:05:25 +0000 (03:05 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1303642 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 22 Mar 2012 03:04:51 +0000 (03: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>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1303641 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 21 Mar 2012 13:01:49 +0000 (13:01 +0000)]
remove bad marge
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1303379 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 20 Mar 2012 14:58:00 +0000 (14:58 +0000)]
don't forget proxy fix for 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302925 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 20 Mar 2012 12:33:21 +0000 (12:33 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302861 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 20 Mar 2012 12:09:05 +0000 (12:09 +0000)]
Merge r1302855 from trunk:
Note that TRACE is not a vuln
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302856 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 19 Mar 2012 21:57:39 +0000 (21:57 +0000)]
Merge r1302674:
Revert r1299786, which is already covered elsewhere in the same document:
document that ap_mpm_query is available only after register hooks
PR: 52889
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302678 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 19 Mar 2012 21:47:14 +0000 (21:47 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302670 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 19 Mar 2012 19:47:15 +0000 (19:47 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302620 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 19 Mar 2012 15:43:28 +0000 (15:43 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302511 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 19 Mar 2012 15:42:42 +0000 (15:42 +0000)]
Typo correction as per https://issues.apache.org/bugzilla/show_bug.cgi?id=52944
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302510 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Mar 2012 13:33:05 +0000 (13:33 +0000)]
Merge r1301504 from trunk:
add filesystem paths to some common error messages.
(slightly modified from dev@ post to not bury the "failed/denied")
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302426 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 19 Mar 2012 00:13:24 +0000 (00:13 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302253 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 Mar 2012 16:17:37 +0000 (16:17 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1302154 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Mar 2012 16:50:47 +0000 (16:50 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301961 13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Sat, 17 Mar 2012 09:08:44 +0000 (09:08 +0000)]
merge with trunk r1301894
Unregistered media types in common use, according to Wikipedia and MS.
New IANA media types as of 2012 Mar 16 18:55 PDT.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301895 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 16 Mar 2012 20:25:56 +0000 (20:25 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301744 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 16 Mar 2012 20:24:09 +0000 (20:24 +0000)]
Various typos and broken links. Daniel Gruno. rumble at cord dot dk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301742 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 16 Mar 2012 20:20:56 +0000 (20:20 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301740 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 16 Mar 2012 20:14:57 +0000 (20:14 +0000)]
Broken link correction. Daniel Gruno (rumble at cord dk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301736 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 16 Mar 2012 20:12:52 +0000 (20:12 +0000)]
Typos and broken links in docs. Daniel Gruno (rumble at cord dk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301733 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 16 Mar 2012 20:03:48 +0000 (20:03 +0000)]
Update xforms, add fcgistarter.8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301729 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 16 Mar 2012 20:02:21 +0000 (20:02 +0000)]
Merge r1301725:
Build fcgistarter.8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301728 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 16 Mar 2012 18:58:18 +0000 (18:58 +0000)]
Merge r1300766:
Fix some typos
No logic change. I think this is CTR, please correct me if I am wrong.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301701 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 16 Mar 2012 18:41:51 +0000 (18:41 +0000)]
style & attributions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301687 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 16 Mar 2012 18:39:29 +0000 (18:39 +0000)]
Merge r1301111:
Properly handle errors from subsequent input filters.
PR 52914.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301686 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 16 Mar 2012 18:36:21 +0000 (18:36 +0000)]
vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301685 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 16 Mar 2012 17:07:38 +0000 (17:07 +0000)]
Done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301651 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 16 Mar 2012 17:03:26 +0000 (17:03 +0000)]
Merge r1300171 from trunk:
* server/mpm_unix.c (dummy_connection): Destroy temp pool and return
on connect() failure.
Reviewed by: jim, trawick, jorton
[added user-incomprehensible CHANGES entry as directed ;) ]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301649 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 16 Mar 2012 17:03:15 +0000 (17:03 +0000)]
vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301648 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 16 Mar 2012 16:56:19 +0000 (16:56 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301645 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 16 Mar 2012 15:07:35 +0000 (15:07 +0000)]
Rebuild various.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301583 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 16 Mar 2012 15:05:02 +0000 (15:05 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301577 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 16 Mar 2012 15:03:48 +0000 (15:03 +0000)]
Answer the "what flavor of regex" question.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301574 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 16 Mar 2012 13:47:22 +0000 (13:47 +0000)]
propose error msg enhancement to include r->filename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301513 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 16 Mar 2012 09:47:02 +0000 (09:47 +0000)]
Merge r1301398, r1301399 from trunk:
fix a misleading example that implies ServerName has precedence over a ServerAlias.
We stop when a vhost matches for any reason (not 2.4 specific). Mention this explicitly.
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301400 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 15 Mar 2012 22:53:27 +0000 (22:53 +0000)]
Fixed Netware builds for PCRE 8.30.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301258 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 15 Mar 2012 20:56:57 +0000 (20:56 +0000)]
merge from trunk r1299738:
mod_proxy_balancer: fix error message implying recovery during a markdown
(a fix for r962972)
Submitted by: covener
Reviewed by: jim, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301194 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 15 Mar 2012 20:53:13 +0000 (20:53 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301192 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 15 Mar 2012 18:35:47 +0000 (18:35 +0000)]
dumpio fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301132 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Mar 2012 18:16:11 +0000 (18:16 +0000)]
Trying to keep 2.4.x in sync w/ trunk... mod_dumpio ackport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301124 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 15 Mar 2012 15:20:13 +0000 (15:20 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301039 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 15 Mar 2012 15:18:13 +0000 (15:18 +0000)]
Broken link fixes. Daniel Gruno again (rumble at cord dot dk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1301034 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 15 Mar 2012 11:54:40 +0000 (11:54 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1300937 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 15 Mar 2012 11:53:21 +0000 (11:53 +0000)]
Patches from Daniel Gruno (rumble at cord dot dk) for broken links in
docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1300936 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 15 Mar 2012 11:30:00 +0000 (11:30 +0000)]
In the docs project, we just keep a STATUS file over in trunk. Removing
the STATUS file in 2.4 before it drifts out of date.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1300929 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 15 Mar 2012 11:27:47 +0000 (11:27 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1300928 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 15 Mar 2012 11:26:30 +0000 (11:26 +0000)]
Links and typos. Daniel Gruno (rumble at cord dot dk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1300926 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 15 Mar 2012 11:24:04 +0000 (11:24 +0000)]
Vote on log message (cut/paste error in http://svn.apache.org/viewvc?view=revision&revision=962972 ??)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1300922 13f79535 -47bb-0310-9956-
ffa450edef68