]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Jim Jagielski [Tue, 10 Jun 2008 16:15:44 +0000 (16:15 +0000)]
required for pass
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@666181
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 10 Jun 2008 15:33:04 +0000 (15:33 +0000)]
Propose CVE-2008-2364 patch for 2.2.9
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@666156
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 9 Jun 2008 16:41:08 +0000 (16:41 +0000)]
Backport r663967
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@665755
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 9 Jun 2008 16:38:10 +0000 (16:38 +0000)]
Low-hanging fruit (vote, promote)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@665754
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 9 Jun 2008 16:04:46 +0000 (16:04 +0000)]
For apr-util-1.3 seperate ldap link options, and default to old behavoir
when linking against apr-util-1.2.
Backports: 663663
Reviewed by: rpluem, fielding, minfrin,
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@665732
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 9 Jun 2008 14:48:25 +0000 (14:48 +0000)]
Remove the example for env negation
since it is not implemented (yet?).
Please revert this when it is implemented.
PR: 44901
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@665707
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Jun 2008 13:36:42 +0000 (13:36 +0000)]
Merge r664535 from trunk:
core: Fix address-in-use startup failure on some platforms caused
by attempting to set up an IPv4 listener which overlaps with an
existing IPv6 listener.
The failure occurred on the second pass of the open-logs hook in
a configuration such as the following:
Listen 8080
Listen 0.0.0.0:8081
Listen [::]:8081
During the first pass, the two port 8081 listen recs were
adjacent and existing logic prevented binding to 0.0.0.0:8081.
On the second pass, they were not adjacent and we then tried
to bind to 0.0.0.0:8081, leading to failure on some platforms
(seen on SLES 9 and Ubuntu 7.10, not seen on many other Unix-ish
platforms).
Leave a note about other unhandled configurations.
Submitted by: trawick
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664705
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 9 Jun 2008 13:28:13 +0000 (13:28 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664699
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Jun 2008 12:03:16 +0000 (12:03 +0000)]
2 votes...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664689
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 8 Jun 2008 18:29:01 +0000 (18:29 +0000)]
propose a fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664537
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 8 Jun 2008 11:07:33 +0000 (11:07 +0000)]
* Update proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664481
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 7 Jun 2008 03:13:55 +0000 (03:13 +0000)]
Catch up to apr-util-1.3.0, build apr_ldap always, and
conditionally build DBD_LIST members.
Backport: 664253
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664254
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jun 2008 21:53:37 +0000 (21:53 +0000)]
The cache_hash, cache_pqueue and cache_cache functions
are undecorated, their .h files are not propagated into
an installed include/ tree, and were erroniously exported.
This doesn't require an mmn bump, because anyone who might
have consumed these modules would have succeeded only with
win32, consuming private headers, and absolutely fails on unix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664149
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 6 Jun 2008 20:54:14 +0000 (20:54 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664122
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jun 2008 20:07:43 +0000 (20:07 +0000)]
Registered functions do need to be NONSTD.
However; why are hook registrations being exported at
all, most registered functions should be static.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664109
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jun 2008 18:55:36 +0000 (18:55 +0000)]
No.
_NONSTD refers to type fn(arg, arg, ...) incomplete declarations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664078
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 6 Jun 2008 17:09:48 +0000 (17:09 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664038
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 6 Jun 2008 16:43:27 +0000 (16:43 +0000)]
Merge r576979 from trunk:
Add a few '/' and remove an errant '>'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664027
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jun 2008 16:39:25 +0000 (16:39 +0000)]
Need to link with rpcrt4.lib to use apr_generate_random_bytes - per r662572.
Submitted by: tdonovan
Backports: r664023
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664024
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 6 Jun 2008 16:34:28 +0000 (16:34 +0000)]
Placeholder for potential backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664022
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 6 Jun 2008 16:05:52 +0000 (16:05 +0000)]
move BalancerMember and ProxyStatus to adjust ordering to trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664005
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 6 Jun 2008 15:52:12 +0000 (15:52 +0000)]
Merge the rest of r627729 from trunk:
wordsmithing
Merge r409455 from trunk:
* Add a note about trailing slashes for ProxyPass and fix the balancer example
accordingly.
PR: 39203
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663989
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 6 Jun 2008 15:26:09 +0000 (15:26 +0000)]
Merge r468896 from trunk:
Add a usage example to mod_proxy_balancer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663981
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 6 Jun 2008 14:37:41 +0000 (14:37 +0000)]
Convert Japanese translations from ISO-2022-JP to UTF-8
since "Support for Additional Languages" needs to be enabled
in the installation of JRE to read ISO-2022-JP.
Reviewed by: kawai
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663965
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Jun 2008 19:11:27 +0000 (19:11 +0000)]
httpd-2.2 and -2.0 specific patch to revert to 2.0.55/2.2.0 handling of the
stdout channel; do not close stdout in the parent process or reassign it to
\\Device\Null, but keep it open so that the console signal handler continues
to interact with the running "daemonized" httpd process.
Not committed to httpd-2.x; there is disagreement as to whether this is good
behavior for a daemon, and the proper 2.4(3.0) behavior on Win32 may be to
daemonize but properly handle -k stop by the PID file contents. Many have
asked for this feature who run a minimal httpd.exe, especially from some
removeable media such as CD, and wish to be able to halt it as a console.
PR: 44800 (part 3/3)
Submitted by: tdonovan
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663704
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Jun 2008 19:00:56 +0000 (19:00 +0000)]
The environment may be manipulated by modules such as mod_perl, so regenerate
the passed env argument on each CreateProcess call.
PR: 44800 (part 2/3)
Submitted by: tdonovan
Backports: r663699
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663700
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Jun 2008 17:27:56 +0000 (17:27 +0000)]
For winnt_mpm console mode, always reset our console handler to be the first,
even on a restart, because some modules (e.g. mod_perl) might have set a console
handler to terminate the process.
PR: 44800 (part 1/3)
Submitted by: tdonovan
Backports: r663669
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663670
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Jun 2008 12:46:43 +0000 (12:46 +0000)]
Merge r649169, r649239, r649840, r649922, r650026, r661452, r661459 from trunk:
Make mod_proxy_ajp aware of the nocanon envvar
handle ? in cases where nocanon is in effect
* Do not add the query string again in the case that we are using the
unparsed uri.
PR: 44803
Set at init time, and combine comments
Typo.
* Do not add the query string again in the case that we are using the
unparsed uri.
PR: 44803
* Set at init time and combine comments.
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663593
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 5 Jun 2008 12:40:49 +0000 (12:40 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663589
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 5 Jun 2008 11:10:15 +0000 (11:10 +0000)]
My vote ;-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663521
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Jun 2008 10:10:36 +0000 (10:10 +0000)]
Note rollup version of nocanon patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663516
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Jun 2008 10:01:30 +0000 (10:01 +0000)]
Merge r661666 from trunk:
Prevent CSRF attacks against the balancer-manager (CVE-2007-6420)
* modules/proxy/mod_proxy_balancer.c (balancer_init): New function.
(balancer_handler): Place a nonce in the form output, and check that
the submitted form data includes that nonce.
(ap_proxy_balancer_register_hook): Register the new post_config hook.
Submitted by: jorton
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663514
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Jun 2008 09:56:56 +0000 (09:56 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663512
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Jun 2008 05:34:03 +0000 (05:34 +0000)]
Interesting solution. Risky if the third party is granted access since they
may observe the noonce value itself. But because no sane administrator should
expose this interface to the general public, the solution seems sane.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663453
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Jun 2008 04:29:56 +0000 (04:29 +0000)]
Prereq was previously adjusted to apr[-util] 1.3.0, so this showstopper
should be resolved.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663445
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 4 Jun 2008 14:17:45 +0000 (14:17 +0000)]
* Bring back veto again, since the issues are still not fixed as per jorton.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@663112
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 3 Jun 2008 17:04:30 +0000 (17:04 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662839
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 3 Jun 2008 16:39:31 +0000 (16:39 +0000)]
Turkish translation:
follow r662725
Submitted by: Nilgün Belma Bugüner <nilgun belgeler.gen tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662833
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 3 Jun 2008 15:08:49 +0000 (15:08 +0000)]
Added another reference to a patch in trunk;
removed Ruediger's no longer valid -1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662819
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 3 Jun 2008 10:16:15 +0000 (10:16 +0000)]
Correct the format errors of revesion reference in french translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662731
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 3 Jun 2008 10:06:06 +0000 (10:06 +0000)]
Merge r661942 from trunk
apachectl configtest or httpd -t doesn't show a list of config files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662725
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Pepper [Tue, 3 Jun 2008 03:12:03 +0000 (03:12 +0000)]
Minor cleanup on DAV Locking module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662628
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 2 Jun 2008 21:27:12 +0000 (21:27 +0000)]
Merge r596448 from trunk:
* Convert request time to seconds before before storing it in unique_id_rec
struct.
PR: 37064
Submitted by: Kobayashi <kobayashi firstserver.co.jp>
Reviewed by: rpluem, jim, pquerna
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662575
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 2 Jun 2008 21:24:12 +0000 (21:24 +0000)]
Merge r629159, r629164, r629218, r630139 from trunk:
Improve salt string generation.
Submited by: Andreas Krennmair <ak synflood.at>
Improve generation of the seed to rand, by using apr_generate_random_bytes,
rather than the current time as a seed.
Fix printing of error message.
* support/htpasswd.c (seed_rand): Fix compiler warning.
PR: 31440
Reviewed by: rpluem, jim, pquerna
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662572
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 2 Jun 2008 21:18:58 +0000 (21:18 +0000)]
Merge r420307 from trunk:
* Add the filename of the configuration file to the warning message
about the useless use of AllowOverride.
PR: 39992
Submitted by: Darryl Miles <darryl darrylmiles.org>
Reviewed by: rpluem, jim, pquerna
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662567
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 2 Jun 2008 21:18:18 +0000 (21:18 +0000)]
Merge r420307 from trunk:
* Add the filename of the configuration file to the warning message
about the useless use of AllowOverride.
PR: 39992
Submitted by: Darryl Miles <darryl darrylmiles.org>
Reviewed by: rpluem, jim, pquerna
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662566
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 2 Jun 2008 20:58:56 +0000 (20:58 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662559
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Mon, 2 Jun 2008 20:25:17 +0000 (20:25 +0000)]
Vote early, vote often.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662548
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 2 Jun 2008 18:00:13 +0000 (18:00 +0000)]
Vote cast!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662501
13f79535 -47bb-0310-9956-
ffa450edef68
Tony Stevenson [Sat, 31 May 2008 21:58:13 +0000 (21:58 +0000)]
Updates from Lucien Gentis. Thanks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662097
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 31 May 2008 12:36:31 +0000 (12:36 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662022
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 31 May 2008 12:13:35 +0000 (12:13 +0000)]
Add Turkish translations
Submitted 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.2.x@662017
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 31 May 2008 11:58:46 +0000 (11:58 +0000)]
Merge r613260 from trunk:
* server/mpm/prefork/prefork.c (child_main): If apr_pollset_poll()
fails with EINTR and die_now has been set (indicating a graceful
stop/restart), terminate the child quickly rather than re-entering
poll().
Submitted by: jorton
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662014
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 31 May 2008 11:58:20 +0000 (11:58 +0000)]
Merge r613252 from trunk:
* server/mpm/prefork/prefork.c (child_main): Unlock the mutex before
terminating in the multi-listener poll error path.
Submitted by: jorton
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662013
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 31 May 2008 11:57:54 +0000 (11:57 +0000)]
Merge r552029 from trunk:
* server/mpm/prefork/prefork.c (child_main): Stop processing new
connections if shutdown_pending is set, i.e. when SIGTERM is received
in single-proecss mode.
Submitted by: Garrett Rooney <rooneg apache.org>
PR: 38848
Submitted by: jorton
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662012
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 31 May 2008 11:57:07 +0000 (11:57 +0000)]
Cast votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662011
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 31 May 2008 09:22:35 +0000 (09:22 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661991
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 31 May 2008 02:49:12 +0000 (02:49 +0000)]
update Japanese translations
Submitted by: kawai
Reviewed by: takashi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661933
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 31 May 2008 01:46:07 +0000 (01:46 +0000)]
fix typo
Submitted by: OKANO Takayoshi <kano na.rim.or jp>
Reviewed by: kawai, takashi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661928
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 30 May 2008 22:11:12 +0000 (22:11 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661897
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 30 May 2008 22:10:16 +0000 (22:10 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661896
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 30 May 2008 21:48:17 +0000 (21:48 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661890
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 30 May 2008 21:32:21 +0000 (21:32 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661883
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 30 May 2008 14:58:15 +0000 (14:58 +0000)]
Vote for 3*prefork tweaks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661748
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 30 May 2008 12:54:04 +0000 (12:54 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661697
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 30 May 2008 12:43:34 +0000 (12:43 +0000)]
Add in CVE fix for balancer-manager
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661693
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 30 May 2008 12:38:46 +0000 (12:38 +0000)]
backport scoreboard-lb_score-2.2.x.patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661691
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 30 May 2008 12:37:36 +0000 (12:37 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661689
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 30 May 2008 12:37:11 +0000 (12:37 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661688
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 29 May 2008 21:38:50 +0000 (21:38 +0000)]
tidy up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661493
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 29 May 2008 20:55:17 +0000 (20:55 +0000)]
3 prefork fixes... testing still in progress but so
far looks good, so note these so I don't forget :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661477
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 29 May 2008 20:34:26 +0000 (20:34 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661467
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 29 May 2008 20:32:42 +0000 (20:32 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661465
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Thu, 29 May 2008 20:11:53 +0000 (20:11 +0000)]
propose old fix from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661458
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 29 May 2008 15:17:52 +0000 (15:17 +0000)]
fix typo
Submitted by: OKANO Takayoshi <kano na.rim.or jp>
Reviewed by: takashi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661349
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 28 May 2008 23:57:53 +0000 (23:57 +0000)]
giggle
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661155
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 28 May 2008 22:13:53 +0000 (22:13 +0000)]
* Update transformation by doing a ./build.sh all convmap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661122
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 28 May 2008 22:09:56 +0000 (22:09 +0000)]
* There is no context 'Location', but only 'directory'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661116
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 28 May 2008 21:58:29 +0000 (21:58 +0000)]
Document the fact that mod_proxy interpolation is now supported in 2.2.9.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661109
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 28 May 2008 21:24:04 +0000 (21:24 +0000)]
Fix error in order in r661087
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661092
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 28 May 2008 21:11:24 +0000 (21:11 +0000)]
Introduce variable interpolation in reverse proxy configuration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661087
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 28 May 2008 21:06:45 +0000 (21:06 +0000)]
Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661084
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 28 May 2008 20:20:46 +0000 (20:20 +0000)]
* Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661069
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 28 May 2008 15:36:19 +0000 (15:36 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660982
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 28 May 2008 15:11:12 +0000 (15:11 +0000)]
sorry, the previous commit (r660967) was bogus
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660970
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 28 May 2008 15:04:55 +0000 (15:04 +0000)]
update Japanese translations
English Revision: 421100
Submitted by: kawai
Reviewed by: takashi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660967
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 28 May 2008 14:09:26 +0000 (14:09 +0000)]
Vote, comment; update 2.2.x version of backport patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660957
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 28 May 2008 12:58:55 +0000 (12:58 +0000)]
remove handled show-stopper
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660937
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 28 May 2008 12:58:29 +0000 (12:58 +0000)]
Merge r660726 from trunk:
* mod_proxy_http.c
Ensure that the EOC bucket is inserted BEFORE an EOS bucket in bb as
some resource filters like mod_deflate pass everything up to the EOS
down the chain immediately and sent the remainder of the brigade later
(or even never). But in this case the ap_http_header_filter does not
get out of our way soon enough.
http_filters.c
Remove all data buckets that are in a brigade after an EOC bucket
was seen, as an EOC bucket tells us that no (further) resource
and protocol data should go out to the client. OTOH meta buckets
are still welcome as they might trigger needed actions down in
the chain (e.g. in network filters like SSL).
Remark 1: It is needed to dump ALL data buckets in the brigade
since an filter in between might have inserted data
buckets BEFORE the EOC bucket sent by the original
sender and we do NOT want this data to be sent.
Remark 2: Dumping all data buckets here does not necessarily mean
that no further data is send to the client as:
1. Network filters like SSL can still be triggered via
meta buckets to talk with the client e.g. for a
clean shutdown.
2. There could be still data that was buffered before
down in the chain that gets flushed by a FLUSH or an
EOS bucket.
PR: 37770
Submitted by: rpluem
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660936
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 28 May 2008 12:58:01 +0000 (12:58 +0000)]
Merge r656400 from trunk:
* Check for failure of apr_file_info_get call
Reported By: BOYA SUN <boya.sun case.edu>
Submitted by: rpluem
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660934
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 28 May 2008 12:57:27 +0000 (12:57 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660933
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 28 May 2008 12:57:02 +0000 (12:57 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660932
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 27 May 2008 23:15:20 +0000 (23:15 +0000)]
another one bites the dust
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660758
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 27 May 2008 23:10:47 +0000 (23:10 +0000)]
Backport r655711
When group is given as a numeric gid, validate it by looking up the
actual group name such that the name can be used in log entries.
PR: 7862
Submitted by: <y-koga apache.or.jp>, Leif W <warp-9.9 usa.net>
Reviewed by: fielding, jim, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660756
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 27 May 2008 22:27:02 +0000 (22:27 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660750
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 27 May 2008 22:26:09 +0000 (22:26 +0000)]
* Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660749
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 27 May 2008 22:21:19 +0000 (22:21 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660748
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 27 May 2008 22:09:24 +0000 (22:09 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660742
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 27 May 2008 21:59:15 +0000 (21:59 +0000)]
* Cast a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660737
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 27 May 2008 21:54:40 +0000 (21:54 +0000)]
* Add a proposal and some kind of show stopper
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660733
13f79535 -47bb-0310-9956-
ffa450edef68