]>
granicus.if.org Git - apache/log
Jim Jagielski [Thu, 13 Jun 2013 15:19:31 +0000 (15:19 +0000)]
Bring proxy and core up to sync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492702 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jun 2013 15:09:31 +0000 (15:09 +0000)]
Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, r1453963, r1454386, r1454414, r1454415, r1458285, r1458447 from trunk:
Rough start for simple, tunneling websocket proxy support.
Compiles at this stage and that's all I know :)
force correct scheme info
We need to ensure a conn_rec
Work around blocking issues...
And now pass the initial request to the backend...
I dislike this duplication of code from mod_proxy_http()
but maybe it's inevitable. I may create ap_proxy_create_headerb()
to create a header brigade that both modules can use.
Pull out duplicated code to proxy_util...
rename extension module... tunnel is more accurate
log nums
"final" rename :)
don't strip these, ensure that they exist.
streamline
bypass reqtimeout for websockets
Keep mod_req clear. Simply scan thru input filters and
remove it within the ws submodule. Nasty, but it keeps
mod_req untouched (for now ;) )
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492699 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Jun 2013 14:47:37 +0000 (14:47 +0000)]
vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492692 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 13 Jun 2013 13:20:11 +0000 (13:20 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492666 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 12 Jun 2013 17:50:46 +0000 (17:50 +0000)]
Note on wstunnel
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492305 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 12 Jun 2013 17:29:34 +0000 (17:29 +0000)]
Mention new mod_lua functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492298 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 12 Jun 2013 15:35:32 +0000 (15:35 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492246 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Jun 2013 13:41:09 +0000 (13:41 +0000)]
Merge r1491458 from trunk:
mod_cache_socache: Use the name of the socache implementation when performing
a lookup rather than using the raw arguments.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492202 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Jun 2013 13:39:56 +0000 (13:39 +0000)]
Merge r1491221, r1491479, r1491538 from trunk:
Reduce stack usage, 32 bytes are enough here, no need to take 8k in the stack. (19 would be enough, but be safe...)
Use the size of the buffer as opposed to MAX_STRING_LEN.
Reduce stack usage, 32 bytes are enough here, no need to
take 8k in the stack. (19 would be enough, but be safe...)
Use the size of the buffer as opposed to MAX_STRING_LEN.
Followup to r1491221+r1491479: change consistently
the same code used in another place in the same file.
Submitted by: jailletc36, minfrin, rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492198 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Jun 2013 13:38:57 +0000 (13:38 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492196 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Jun 2013 13:38:19 +0000 (13:38 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1492195 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 11 Jun 2013 19:36:59 +0000 (19:36 +0000)]
mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700).
backport r1439027
Expand mod_lua stack size to fit image and readdress the remaining modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491922 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 11 Jun 2013 19:18:33 +0000 (19:18 +0000)]
mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700).
Added missing files from commit r1491468.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491913 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 10 Jun 2013 21:41:07 +0000 (21:41 +0000)]
comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491612 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 10 Jun 2013 20:02:59 +0000 (20:02 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491586 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 10 Jun 2013 19:08:24 +0000 (19:08 +0000)]
Update proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491569 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 10 Jun 2013 17:50:45 +0000 (17:50 +0000)]
Add to existing proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491540 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 15:12:01 +0000 (15:12 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491487 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:51:13 +0000 (14:51 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491482 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:46:37 +0000 (14:46 +0000)]
core: Add dirwalk_stat hook.
trunk patch: http://svn.apache.org/r1388447
Submitted by: trawick
Reviewed by: minfrin, jim, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491476 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:41:34 +0000 (14:41 +0000)]
core: Add post_perdir_config hook.
trunk patch: http://svn.apache.org/r1368121
Submitted by: minfrin
Reviewed by: jim, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491472 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:36:56 +0000 (14:36 +0000)]
mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700):
2.4.x patch: http://www.humbedooh.com/mod_lua_2013_06_07.patch
Submitted by: humbedooh
Reviewed by: fuankg, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491468 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:34:59 +0000 (14:34 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491467 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:28:08 +0000 (14:28 +0000)]
proxy_util: NULL terminate the right buffer in 'send_http_connect'
trunk patch: http://svn.apache.org/r1490994
Submitted by: jailletc36
Reviewed by: covener, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491466 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:26:32 +0000 (14:26 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491465 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:24:33 +0000 (14:24 +0000)]
mod_remoteip: close file in error path
trunk patch: http://svn.apache.org/r1491234
Submitted by: jailletc36
Reviewed by: covener, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491464 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:22:57 +0000 (14:22 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491463 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 10 Jun 2013 14:12:03 +0000 (14:12 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491460 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 10 Jun 2013 07:09:26 +0000 (07:09 +0000)]
vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491352 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 10 Jun 2013 00:43:55 +0000 (00:43 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491317 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 10 Jun 2013 00:40:06 +0000 (00:40 +0000)]
Merge r1490446 from trunk:
PR55069 include line number in 'AH00113: cannot use a full URL in a 401 ErrorDocument'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491315 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 9 Jun 2013 17:45:37 +0000 (17:45 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491252 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 9 Jun 2013 10:00:04 +0000 (10:00 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491169 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 9 Jun 2013 08:22:13 +0000 (08:22 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491156 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Jun 2013 15:39:48 +0000 (15:39 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1491003 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 7 Jun 2013 18:22:08 +0000 (18:22 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490771 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 7 Jun 2013 18:21:28 +0000 (18:21 +0000)]
typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490770 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 7 Jun 2013 18:12:59 +0000 (18:12 +0000)]
add a rev and reset vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490763 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 7 Jun 2013 16:42:45 +0000 (16:42 +0000)]
promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490715 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 7 Jun 2013 16:38:35 +0000 (16:38 +0000)]
vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490713 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 7 Jun 2013 16:16:42 +0000 (16:16 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490703 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 7 Jun 2013 13:35:38 +0000 (13:35 +0000)]
Minor typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490641 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 7 Jun 2013 13:20:30 +0000 (13:20 +0000)]
Merge r1490630 from trunk:
speling, pointed out by sluggr on freenode.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490633 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 7 Jun 2013 13:02:06 +0000 (13:02 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490628 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jun 2013 11:51:28 +0000 (11:51 +0000)]
mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)
Server pools, new apr functions for the request_rec table, input/output filters,
LuaCodeCache, LuaMapHandler and multipart form data handling. This is long
overdue, and has become too spaghetti-ish to propose in chunks :|
trunk patch: http://svn.apache.org/r1366890
http://svn.apache.org/r1367025
http://svn.apache.org/r1367040
http://svn.apache.org/r1367048
http://svn.apache.org/r1383024
http://svn.apache.org/r1383028
http://svn.apache.org/r1383037
http://svn.apache.org/r1367725
http://svn.apache.org/r1367875
http://svn.apache.org/r1368109
http://svn.apache.org/r1369656
http://svn.apache.org/r1369793
http://svn.apache.org/r1369800
http://svn.apache.org/r1370158
http://svn.apache.org/r1433967
http://svn.apache.org/r1429169
http://svn.apache.org/r1425450
http://svn.apache.org/r1425243
http://svn.apache.org/r1422552
http://svn.apache.org/r1422548
http://svn.apache.org/r1422531
http://svn.apache.org/r1422373
http://svn.apache.org/r1422072
http://svn.apache.org/r1421784
http://svn.apache.org/r1421780
(the list goes on...)
2.4.x patch: http://www.humbedooh.com/mod_lua_sync.patch (+CHANGES)
Submitted by: humbedooh
Reviewed by: jim, covener, fuankg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490599 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jun 2013 11:36:15 +0000 (11:36 +0000)]
core: make the "default" parameter of the "ErrorDocument" option case insensitive.
PR 54419
trunk patch: http://svn.apache.org/r1465190
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490594 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jun 2013 11:29:07 +0000 (11:29 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490590 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jun 2013 11:20:06 +0000 (11:20 +0000)]
mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive.
PR 54420
trunk patch: http://svn.apache.org/r1464762
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490589 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jun 2013 11:15:46 +0000 (11:15 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490587 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jun 2013 10:56:02 +0000 (10:56 +0000)]
mod_cache: Make option "CacheDisable" in mod_cache case insensitive PR 54462
trunk patch: http://svn.apache.org/r1464721
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490581 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jun 2013 10:51:59 +0000 (10:51 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490580 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jun 2013 10:09:44 +0000 (10:09 +0000)]
support: Do not use free for memory allocated in a pool (regression introduced in r1476674)
trunk patch: http://svn.apache.org/r1490507
Submitted by: jailletc36
Reviewed by: fuankg, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490564 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 7 Jun 2013 10:04:32 +0000 (10:04 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490563 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 7 Jun 2013 08:51:10 +0000 (08:51 +0000)]
Fixed wording.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490546 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 7 Jun 2013 08:46:22 +0000 (08:46 +0000)]
vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490543 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 7 Jun 2013 05:26:08 +0000 (05:26 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490515 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 7 Jun 2013 05:14:23 +0000 (05:14 +0000)]
backport fix of a comment used by doxygen (was part of r1086071)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490514 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 7 Jun 2013 01:54:30 +0000 (01:54 +0000)]
propose rotatelogs feature
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490494 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 6 Jun 2013 21:21:00 +0000 (21:21 +0000)]
propose an error message enhancement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490447 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 6 Jun 2013 20:18:03 +0000 (20:18 +0000)]
Add apachehaus. order alpha.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490425 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 6 Jun 2013 20:12:52 +0000 (20:12 +0000)]
Forgot to mention Apache Lounge.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490419 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 6 Jun 2013 20:09:39 +0000 (20:09 +0000)]
Various other rebuilds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490417 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 6 Jun 2013 20:09:10 +0000 (20:09 +0000)]
Rebuild html, metafiles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490414 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 6 Jun 2013 20:06:15 +0000 (20:06 +0000)]
Download locations, from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1490413 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Jun 2013 13:01:50 +0000 (13:01 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1488519 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 1 Jun 2013 02:28:40 +0000 (02:28 +0000)]
vote&promote Lua trunk synch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1488452 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 31 May 2013 11:22:16 +0000 (11:22 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1488166 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 31 May 2013 11:18:09 +0000 (11:18 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1488163 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 30 May 2013 21:40:59 +0000 (21:40 +0000)]
Backport r1488022
Add missing LoadModule line for mod_auth_form
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1488023 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 29 May 2013 21:28:41 +0000 (21:28 +0000)]
Merge r1454888:
Typo
No code change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487648 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 29 May 2013 12:32:06 +0000 (12:32 +0000)]
'make docs' xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487456 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 29 May 2013 12:30:11 +0000 (12:30 +0000)]
grab r1487451 from trunk:
s/proxy image/proxy/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487455 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 21:32:01 +0000 (21:32 +0000)]
mod_cache: If a 304 response indicates an entity not currently cached, then
the cache MUST disregard the response and repeat the request without the
conditional.
trunk patch: http://svn.apache.org/r1481197
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-uncacheable304-2.4.patch
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487131 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 21:29:03 +0000 (21:29 +0000)]
mod_cache: Ensure that we don't attempt to replace a cached response
with an older response as per RFC2616 13.12.
trunk patch: http://svn.apache.org/r1479966
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-olderdate2.4.patch
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487129 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 21:22:00 +0000 (21:22 +0000)]
core, mod_cache: Ensure RFC2616 compliance in ap_meets_conditions()
with weak validation combined with If-Range and Range headers. Break
out explicit conditional header checks to be useable elsewhere in the
server. Ensure weak validation RFC compliance in the byteranges filter.
Ensure RFC validation compliance when serving cached entities. PR 16142
trunk patch: http://svn.apache.org/r1479905
2.4.x patch: http://people.apache.org/~minfrin/httpd-if-range-fix2.4.patch
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487127 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 21:17:53 +0000 (21:17 +0000)]
core: Add the ability to do explicit matching on weak and strong ETags
as per RFC2616 Section 13.3.3.
trunk patch: http://svn.apache.org/r1479528
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487123 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 21:12:19 +0000 (21:12 +0000)]
mod_cache: Ensure that updated responses to HEAD requests don't get
mistakenly paired with a previously cached body. Ensure that any existing
body is removed when a HEAD request is cached.
trunk patch: http://svn.apache.org/r1479411
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487122 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 21:09:34 +0000 (21:09 +0000)]
mod_cache: Honour Cache-Control: no-store in a request.
trunk patch: http://svn.apache.org/r1479222
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-nostore2.4.patch
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487121 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 21:02:17 +0000 (21:02 +0000)]
mod_cache: Make sure that contradictory entity headers present in a 304
Not Modified response are caught and cause the entity to be removed.
trunk patch: http://svn.apache.org/r1479117
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-304sanity.patch2.4.patch
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487118 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 20:55:01 +0000 (20:55 +0000)]
mod_cache: Make sure Vary processing handles multivalued Vary headers and
multivalued headers referred to via Vary.
trunk patch: http://svn.apache.org/r1478748
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487114 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 20:50:34 +0000 (20:50 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487109 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 20:49:52 +0000 (20:49 +0000)]
mod_cache: When serving from cache, only the last header of a multivalued
header was taken into account. Fixed. Ensure that Warning headers are correctly
handled as per RFC2616.
trunk patch: http://svn.apache.org/r1478441
http://svn.apache.org/r1480283
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-multipleheaders2.4.patch
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487108 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 20:34:12 +0000 (20:34 +0000)]
mod_cache: Ignore response headers specified by no-cache=header and
private=header as specified by RFC2616 14.9.1 What is Cacheable. Ensure
that these headers are still processed when multiple Cache-Control
headers are present in the response. PR 54706
trunk patch: http://svn.apache.org/r1478382
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-nocacheheader2.4.patch
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487103 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 20:30:04 +0000 (20:30 +0000)]
mod_cache: Invalidate cached entities in response to RFC2616 Section
13.10 Invalidation After Updates or Deletions. PR 15868
trunk patch: http://svn.apache.org/r1070179
http://svn.apache.org/r1478140
http://svn.apache.org/r1478173
http://svn.apache.org/r1478798
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-invalidate7.patch
Submitted by: minfrin
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487102 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 19:24:22 +0000 (19:24 +0000)]
These two have been backported earlier, removing from the list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1487066 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 28 May 2013 16:08:47 +0000 (16:08 +0000)]
Win32 build, proxy RFC behavior voted up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486986 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 14:27:32 +0000 (14:27 +0000)]
makefile.win: Adjust makefile to properly detect the need to use devenv
on applicable MSVC versions.
trunk patch: http://svn.apache.org/r1482041
Submitted by: gsmith
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486938 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 14:26:00 +0000 (14:26 +0000)]
libhttpd.dsp: Fix Debug build mentioned by fuankg in
http://mail-archives.apache.org/mod_mbox/httpd-dev/201305.mbox/%
3C519FC54E .901@apache.org%3E.
trunk patch: http://svn.apache.org/r1486490
Submitted by: gsmith
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486937 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 14:24:40 +0000 (14:24 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486935 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 14:23:55 +0000 (14:23 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486934 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 14:13:51 +0000 (14:13 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486929 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 14:09:11 +0000 (14:09 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486928 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 28 May 2013 13:45:52 +0000 (13:45 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486922 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 28 May 2013 11:38:33 +0000 (11:38 +0000)]
ivote !
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486881 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 27 May 2013 19:14:16 +0000 (19:14 +0000)]
Simple proposals for Windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486698 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 May 2013 20:07:04 +0000 (20:07 +0000)]
mod_dav: Improve error handling in dav_method_put(), add new
dav_join_error() function. PR 54145.
trunk patch: http://svn.apache.org/r1464241
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_dav-errorhandling.patch
Submitted by: Ben Reser <ben reser.org>
Reviewed by: minfrin, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486464 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 May 2013 20:01:35 +0000 (20:01 +0000)]
mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with
the source href (sent as part of the request body as XML) pointing to a
URI that is not configured for DAV will trigger a segfault.
trunk patch: http://svn.apache.org/r1485668
Submitted by: Ben Reser <ben reser.org>
Reviewed by: minfrin, covener, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486461 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 May 2013 19:58:20 +0000 (19:58 +0000)]
mod_dav: Do not fail PROPPATCH when prop namespace is not known. PR 52559
trunk patch: http://svn.apache.org/r1476644
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486459 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 May 2013 19:53:59 +0000 (19:53 +0000)]
mod_dav: When a PROPPATCH attempts to remove a non-existent dead
property on a resource for which there is no dead property in the same
namespace httpd segfaults. PR 52559
trunk patch: http://svn.apache.org/r1476642
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486458 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 May 2013 19:48:45 +0000 (19:48 +0000)]
mod_dav: Sending an If or If-Match header with an invalid ETag doesn't
result in a 412 Precondition Failed for a COPY operation. PR54610
trunk patch: http://svn.apache.org/r1476604
Submitted by: Timothy Wood <tjw omnigroup.com>
Reviewed by: minfrin, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1486456 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log