]>
granicus.if.org Git - apache/log
Jim Jagielski [Mon, 6 Aug 2012 12:50:00 +0000 (12:50 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369822 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 6 Aug 2012 12:16:03 +0000 (12:16 +0000)]
clarify that the 2.4 pidfile APIs process paths relative to ServerRoot
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369810 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 6 Aug 2012 10:05:19 +0000 (10:05 +0000)]
Propose + vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369766 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 6 Aug 2012 06:04:36 +0000 (06:04 +0000)]
Up to date with .en version of the document.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369727 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 6 Aug 2012 05:59:53 +0000 (05:59 +0000)]
Fixing link as reported by Louise Hope @ http://httpd.apache.org/docs/2.2/howto/htaccess.html#comment_184
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369725 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 5 Aug 2012 21:46:26 +0000 (21:46 +0000)]
Fix revision number in backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369692 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 Aug 2012 19:31:44 +0000 (19:31 +0000)]
Propose + vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369650 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 5 Aug 2012 14:58:34 +0000 (14:58 +0000)]
Adding new .fr translation for mod_session documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369609 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 5 Aug 2012 14:35:48 +0000 (14:35 +0000)]
merge r1364709 from trunk:
doc fixes for r1299718:
The value of ScriptSock is relative to DefaultRuntimeDir.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369607 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 5 Aug 2012 13:48:40 +0000 (13:48 +0000)]
mod_ssl: Add new directive SSLCompression to disable
TLS-level compression.
PR 53219.
Backport of r1345319 and r1348656 from trunk.
Submitted by: Bjoern Jacke <bjoern j3e de>, sf
Reviewed by: rjung, trawick
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369585 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 5 Aug 2012 13:02:24 +0000 (13:02 +0000)]
Merge r1369568 from trunk:
bytes is not a unit of filename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369569 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 5 Aug 2012 00:14:13 +0000 (00:14 +0000)]
SSLCompression directive approved
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369507 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 4 Aug 2012 22:21:56 +0000 (22:21 +0000)]
Big mod_lua backport:
r1201460: Add some todos from apachecon notes.
Submitted by: covener
r1351012: Change prototype of vm_construct, to work around gcc bug which
causes a segfault. PR: 52779
Submitted by: Dick Snippe <Dick Snippe tech omroep nl>
r1351013: Allow tail call optimization in log methods, remove foo method.
Submitted by: sf
r1351014: Add a few missing request_rec fields. Rename remote_ip to
client_ip to match conn_rec.
Submitted by: sf
r1351017: Change various strings from char * to const char *.
Submitted by: sf
r1351018: Factor common code into utility function.
Also improve logging a bit and adjust some log levels.
Submitted by: sf
r1351019: Use macro to make definition of integer fields more compact.
Submitted by: sf
Reviewed by: humbedooh, covener, sf
Backported by: humbedooh, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369494 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 4 Aug 2012 21:30:11 +0000 (21:30 +0000)]
MPM event:
- Keep track of the number of clogged, lingering, and suspended connections.
- Don't count connections in lingering close state when calculating
how many additional connections may be accepted
Backport of r1361773 and r
1361778 from trunk.
Submitted by: sf
Reviewed by: rjung, jim
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369473 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 4 Aug 2012 21:22:38 +0000 (21:22 +0000)]
mod_ssl: Pass the server_rec to ssl_die() and use it to log a message to
the main error log, pointing to the appropriate virtual host error log.
Backport of r1348660 from trunk.
Submitted by: sf
Reviewed by: rjung, covener
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369464 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 4 Aug 2012 21:00:28 +0000 (21:00 +0000)]
grab r1369435 from trunk:
fix documented default value of ScoreBoardFile
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369436 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 4 Aug 2012 20:44:48 +0000 (20:44 +0000)]
grab r1369300 and
1369431 from trunk:
mention migration from ap_requires() and to ap_runtime_dir_relative()
fix formatting of DEFAULT_REL_RUNTIMEDIR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369432 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 4 Aug 2012 20:31:50 +0000 (20:31 +0000)]
Merge r1369419:
r1364253 added and include to mod_ssl.h
Show the compiler where to find it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369427 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 4 Aug 2012 19:31:16 +0000 (19:31 +0000)]
revert r1369191
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369418 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 4 Aug 2012 16:56:38 +0000 (16:56 +0000)]
vote & promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369373 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 4 Aug 2012 15:32:52 +0000 (15:32 +0000)]
+1 for lua resynch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369348 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 3 Aug 2012 20:13:38 +0000 (20:13 +0000)]
r1364253 forces the build to find mod_ssl.h
This should be CTR, feel free to revert if you do
not like this way of finding the required header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1369191 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:25:05 +0000 (13:25 +0000)]
merged
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368462 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:09:30 +0000 (13:09 +0000)]
Merge r1366319 from trunk:
ap_str(case)cmp_match returns the opposite of what is advertized in the header.
Submitted by: humbedooh
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368453 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:08:43 +0000 (13:08 +0000)]
Merge r1361766 from trunk:
Simplify handling of MaxConnectionsPerChild
If we decrement the counter at accept time and not at close time,
we only need to access the counter in the listener thread and the
code gets much simpler.
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368452 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:08:05 +0000 (13:08 +0000)]
Merge r1351016 from trunk:
pass the provider name to parse_require_line as pool userdata
This allows a single C function to implement several authz providers.
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368451 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:07:31 +0000 (13:07 +0000)]
Merge r1334343 from trunk:
Use short lived pool to avoid memory leaks
Remove the comment about binding upstream and downstream connections. It
seems to be obsolete since r104604, r104605, r105108.
Also avoid allocating memory if we are not handling the connection.
PR: 52275
Submitted by: Naohiro Ooiwa <naohiro ooiwa miraclelinux com>, Stefan Fritsch
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368450 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:05:28 +0000 (13:05 +0000)]
Merge r1324760 from trunk:
Your APR does not include SSL/EVP support. Yes, but how do I enable it? --with-crypto
Submitted by: igalic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368448 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:04:51 +0000 (13:04 +0000)]
Merge r1242798 from trunk:
* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
Treat EAGAIN as an error for a blocking read from the input filter
stack.
Submitted by: jorton
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368447 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:04:06 +0000 (13:04 +0000)]
promotion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368446 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:03:15 +0000 (13:03 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368443 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 17:16:14 +0000 (17:16 +0000)]
Propose sync of sf's fixes/refactoring in mod_lua, so we can get the ball rolling on the rest of the changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368132 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Aug 2012 16:38:25 +0000 (16:38 +0000)]
xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368108 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Aug 2012 16:23:28 +0000 (16:23 +0000)]
Remove anchor with dublicate id.
Backport of r1368094 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368097 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Aug 2012 16:21:33 +0000 (16:21 +0000)]
Complete docs metadata (sourcefile and identifier)
for mod_unixd and mod_privileges.
Backport of r1368058 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368096 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Aug 2012 15:26:38 +0000 (15:26 +0000)]
Add a docs link to a configuration example.
Backport of r1368053 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1368054 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 13:10:58 +0000 (13:10 +0000)]
Dropping the LuaCodeCache proposal until we get the rest of the backports sorted out (tba).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367977 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 12:39:30 +0000 (12:39 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367961 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 12:36:59 +0000 (12:36 +0000)]
Fix an XML bug in the french translation of mod_proxy_html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367960 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 12:35:41 +0000 (12:35 +0000)]
add a missing </p>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367958 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 12:30:39 +0000 (12:30 +0000)]
Change the external reference to mod_proxy_html to an internal one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367956 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jul 2012 21:01:02 +0000 (21:01 +0000)]
Fix typo in docs
(miscomception ->misconception)
Backport of r1367778 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367779 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 15:02:08 +0000 (15:02 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367595 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 14:57:48 +0000 (14:57 +0000)]
Remove [max|min max] from the LuaScope syntax, since the 'server' scope is not implemented yet.
Add the 'thread' value to the list of possible scopes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367592 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 30 Jul 2012 20:58:07 +0000 (20:58 +0000)]
some votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367295 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 10:04:20 +0000 (10:04 +0000)]
Propose (see note in diff)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1367052 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 29 Jul 2012 20:51:32 +0000 (20:51 +0000)]
correct mis-vote in r1366668
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366949 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 20:37:11 +0000 (20:37 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366948 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 29 Jul 2012 20:34:30 +0000 (20:34 +0000)]
Another easy backport. Only header correction,
probably even CTR?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366947 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 29 Jul 2012 20:26:17 +0000 (20:26 +0000)]
Add merge info for r1363908 (r1363186).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366944 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 29 Jul 2012 20:09:27 +0000 (20:09 +0000)]
Add mergeinfo for r1365604 (
1365479 )
and r1366693 (
1365001 ,
1365020 ,
1365029 ).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366933 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 29 Jul 2012 18:00:23 +0000 (18:00 +0000)]
Add some backport proposals. Most of them pretty
small and easy to review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366882 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 16:05:47 +0000 (16:05 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366866 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 16:00:22 +0000 (16:00 +0000)]
LuaQuickHandler had no syntax, which made the reference sheet look wrong.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366863 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 15:50:52 +0000 (15:50 +0000)]
Comment out LuaCodeCache, which hasn't been implemented yet.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366860 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 28 Jul 2012 14:40:23 +0000 (14:40 +0000)]
* mod_proxy*: ProxyBlock fixes; PR 43697 and more.
trunk patch: http://svn.apache.org/viewvc?rev=
1365001 &view=rev and
http://svn.apache.org/viewvc?rev=
1365020 &view=rev and
http://svn.apache.org/viewvc?rev=
1365029 &view=rev
2.4.x patch: http://people.apache.org/~jorton/ap_proxyblock-24x-v2.diff [avoids major MMN bump]
+1: jorton, rjung, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366693 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 28 Jul 2012 14:39:18 +0000 (14:39 +0000)]
Merge r1366344 from trunk:
mod_proxy_balancer: Restore balancing after a failed worker has
recovered when using lbmethod_bybusyness.
PR: 48735
Markus Stoll and Adam C both submitted patches against 2.2.x
to bug 48735. Compared with those two, this solution
1. resets the busy field in the error-ed worker at the end of
the request instead of at recovery time
2. leaves the lbstatus field alone
3. covers all possible scenarios where the busy field in the
error-ed worker needs to be adjusted, since a cleanup to
perform the decrement is registered at the point of the
increment
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366691 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 28 Jul 2012 14:37:54 +0000 (14:37 +0000)]
Merge r1366621 from trunk:
LUA_COMPAT_ALL should be defined _before_ including lua headers
Submitted by: humbedooh
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366689 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 28 Jul 2012 14:37:19 +0000 (14:37 +0000)]
Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366688 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 28 Jul 2012 14:36:56 +0000 (14:36 +0000)]
Votes on proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366687 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 28 Jul 2012 13:35:54 +0000 (13:35 +0000)]
quick votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366668 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 28 Jul 2012 12:01:39 +0000 (12:01 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366658 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 27 Jul 2012 12:13:48 +0000 (12:13 +0000)]
this is one way to get eyes on a patch...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366358 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Jul 2012 21:29:15 +0000 (21:29 +0000)]
mod_setenvif: Compile the regex used by is_header_regex() only once
during startup This should save some memory, especially with .htaccess
Backport of r1343099.
Submitted by: sf
Reviewed by: rjung, jim
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365774 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Jul 2012 21:17:16 +0000 (21:17 +0000)]
Add the port number to the vhost's name in scoreboard.
Backport of r1294358 from trunk.
Submitted by: sf
Reviewed by: rjung, jim
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365753 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Jul 2012 21:15:27 +0000 (21:15 +0000)]
Remove historic comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365752 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 25 Jul 2012 19:40:12 +0000 (19:40 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365702 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 25 Jul 2012 19:26:55 +0000 (19:26 +0000)]
Vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365700 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 14:37:42 +0000 (14:37 +0000)]
r1365479 done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365605 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 14:37:16 +0000 (14:37 +0000)]
Merge r1365479 from trunk:
* modules/proxy/proxy_util.c (ap_proxy_location_reverse_map): Fix
to skip balancer:// prefix where applicable.
Reviewed by: jorton, jim, rjung
PR: 45434 (regressed since 2.2)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365604 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 14:35:32 +0000 (14:35 +0000)]
Fixes for proxyblock patch - thanks to rjung.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365603 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Jul 2012 14:09:17 +0000 (14:09 +0000)]
Vote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365594 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:50:06 +0000 (11:50 +0000)]
Merge r1352047, r1361298 from trunk:
Add the missing parsebody function to mod_lua, for parsing POST data.
PR 53064.
- Define LUA_COMPAT_ALL so mod_lua will be compatible with Lua 5.2
- Add an optional integer argument for parsebody, specifying the maximum size of POST that will be accepted.
Submitted by: humbedooh
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365539 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:42:40 +0000 (11:42 +0000)]
* apxs: Make apxs use LDFLAGS from config_vars.mk in addition to
CFLAGS and CPPFLAGS.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1343094
2.4.x patch: trunk patch works
+1: rjung, humbedooh, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365532 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:39:52 +0000 (11:39 +0000)]
* .gdbinit: improve dump_allocator, add dump_one_pool.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1352909
2.4.x patch: trunk patch works
+1: rjung, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365529 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:38:19 +0000 (11:38 +0000)]
* htpasswd: Note more prominently that SHA and crypt are insecure.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1352910
2.4.x patch: trunk patch works
+1: rjung, humbedooh, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365528 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:36:15 +0000 (11:36 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365526 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:35:35 +0000 (11:35 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365524 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 07:33:24 +0000 (07:33 +0000)]
Propose r1365479.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365481 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 24 Jul 2012 21:15:52 +0000 (21:15 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365291 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 24 Jul 2012 21:13:08 +0000 (21:13 +0000)]
Remove reference to the 'server' value in LuaScope, since it doesn't exist.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365289 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Tue, 24 Jul 2012 16:59:53 +0000 (16:59 +0000)]
Adding .fr translation for mod_proxy_html documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365169 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Tue, 24 Jul 2012 16:39:24 +0000 (16:39 +0000)]
Adding french translation for mod_proxy_fcgi documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365163 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 24 Jul 2012 14:05:35 +0000 (14:05 +0000)]
Nominate ProxyBlock fixes.#
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365066 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Jul 2012 12:19:08 +0000 (12:19 +0000)]
mpm_event, mpm_worker: Remain active amidst prevalent child process
resource shortages.
Submitted by: trawick
Reviewed by: jorton, rjung, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365003 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 22:00:46 +0000 (22:00 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364818 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 21:59:56 +0000 (21:59 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364817 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Jul 2012 17:06:05 +0000 (17:06 +0000)]
Encourage best practice in Perl scripts (use strict, warnings).
Backport of r1335882 and r1325724 from trunk.
Submitted by: rbowen
Reviewed by: rjung, humbedooh
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364713 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Jul 2012 16:59:21 +0000 (16:59 +0000)]
Rich Bowen [Mon, 23 Jul 2012 16:44:30 +0000 (16:44 +0000)]
Vote for backport of Perl script enhancements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364710 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Jul 2012 16:43:56 +0000 (16:43 +0000)]
Honor DefaultRuntimeDir for mutexes, socache and CGID socket.
Move away from DEFAULT_REL_RUNTIMEDIR and use
ap_runtime_dir_relative() API.
Backport of r1299718 from trunk.
Submitted by: jim
Reviwed by: rjung, trawick
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364709 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Jul 2012 16:33:56 +0000 (16:33 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364700 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:35:53 +0000 (15:35 +0000)]
Backports*2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364685 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:34:59 +0000 (15:34 +0000)]
Merge r1327689 from trunk:
For a local variable in a macro, use a name that is less likely to clash
with other variable names.
Submitted by: sf
Reviewed by: rjung, humbedooh, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364682 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:34:05 +0000 (15:34 +0000)]
Merge r1361803 from trunk:
Code clean up (remove useless memory allocation)
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 52648
Reviewed by: rjung, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364681 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:33:01 +0000 (15:33 +0000)]
More votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364680 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:22:34 +0000 (15:22 +0000)]
Backports*3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364678 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:21:52 +0000 (15:21 +0000)]
Merge r1352534 from trunk:
* modules/cache/cache_util.c (write_write_order): Remove redundant
double assignment, caught by Coverity. No functional change.
Reviewed by: rjung, humbedooh, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364677 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:20:48 +0000 (15:20 +0000)]
Merge r1341906, r1341913 from trunk:
* acinclude.m4: Use AC_MSG_NOTICE.
* configure.in: Use AC_MSG_NOTICE so passing --silent works as advertised.
Reviewed by: rjung, humbedooh, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364675 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:19:37 +0000 (15:19 +0000)]
Merge r1351737 from trunk:
* support/ab.c (test, start_connect): Only bind the local end of the
socket (and look up an address for it) if -B is specified.
Reviewed by: trawick, rjung, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364674 13f79535 -47bb-0310-9956-
ffa450edef68