]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
17 years agoMerge r468896 from trunk:
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

17 years agoConvert Japanese translations from ISO-2022-JP to UTF-8
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

17 years agohttpd-2.2 and -2.0 specific patch to revert to 2.0.55/2.2.0 handling of the
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

17 years agoThe environment may be manipulated by modules such as mod_perl, so regenerate
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

17 years agoFor winnt_mpm console mode, always reset our console handler to be the first,
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

17 years agoMerge r649169, r649239, r649840, r649922, r650026, r661452, r661459 from trunk:
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

17 years ago* Promote
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

17 years agoMy vote ;-)
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

17 years agoNote rollup version of nocanon patch
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

17 years agoMerge r661666 from trunk:
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

17 years agopromote
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

17 years agoInteresting solution. Risky if the third party is granted access since they
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

17 years agoPrereq was previously adjusted to apr[-util] 1.3.0, so this showstopper
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

17 years ago* Bring back veto again, since the issues are still not fixed as per jorton.
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

17 years agoupdate transformations
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

17 years agoTurkish translation:
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

17 years agoAdded another reference to a patch in trunk;
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

17 years agoCorrect the format errors of revesion reference in french translations
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

17 years agoMerge r661942 from trunk
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

17 years ago Minor cleanup on DAV Locking module.
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

17 years agoMerge r596448 from trunk:
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

17 years agoMerge r629159, r629164, r629218, r630139 from trunk:
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

17 years agoMerge r420307 from trunk:
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

17 years agoMerge r420307 from trunk:
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

17 years ago* Promote
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

17 years agoVote early, vote often.
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

17 years agoVote cast!
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

17 years agoUpdates from Lucien Gentis. Thanks.
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

17 years agoupdate transformations
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

17 years agoAdd Turkish translations
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

17 years agoMerge r613260 from trunk:
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

17 years agoMerge r613252 from trunk:
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

17 years agoMerge r552029 from trunk:
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

17 years agoCast votes
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

17 years ago* Add proposal
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

17 years agoupdate Japanese translations
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

17 years agofix typo
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

17 years ago* Promote
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

17 years ago* Vote
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

17 years ago* Add a proposal
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

17 years ago* Add a proposal
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

17 years agoVote for 3*prefork tweaks.
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

17 years agoVote.
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

17 years agoAdd in CVE fix for balancer-manager
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

17 years agobackport scoreboard-lb_score-2.2.x.patch
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

17 years agopromote
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

17 years agoVotes
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

17 years agotidy up
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

17 years ago3 prefork fixes... testing still in progress but so
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

17 years ago* Vote
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

17 years ago* Add a proposal
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

17 years agopropose old fix from trunk
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

17 years agofix typo
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

17 years agogiggle
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

17 years ago* Update transformation by doing a ./build.sh all convmap
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

17 years ago* There is no context 'Location', but only 'directory'.
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

17 years agoDocument the fact that mod_proxy interpolation is now supported in 2.2.9.
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

17 years agoFix error in order in r661087
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

17 years agoIntroduce variable interpolation in reverse proxy configuration
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

17 years agoPromote
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

17 years ago* Add a comment
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

17 years agoupdate transformation
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

17 years agosorry, the previous commit (r660967) was bogus
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

17 years agoupdate Japanese translations
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

17 years agoVote, comment; update 2.2.x version of backport patch
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

17 years agoremove handled show-stopper
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

17 years agoMerge r660726 from trunk:
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

17 years agoMerge r656400 from trunk:
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

17 years agopromote
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

17 years agovote
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

17 years agoanother one bites the dust
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

17 years agoBackport r655711
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

17 years ago* Promote
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

17 years ago* Add a comment
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

17 years ago* Vote
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

17 years agovote
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

17 years ago* Cast a vote
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

17 years ago* Add a proposal and some kind of show stopper
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

17 years agoknew I forgot something
Roy T. Fielding [Tue, 27 May 2008 21:50:13 +0000 (21:50 +0000)] 
knew I forgot something

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660731 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMerge r659560, r660485 from trunk:
Eric Covener [Tue, 27 May 2008 21:43:39 +0000 (21:43 +0000)] 
Merge r659560, r660485 from trunk:

The response to the TRACE method is partially garbled on an EBCDIC platform.
Send the request line and trailing CRLF in ASCII.

Submitted by:           David Jones <oscaremma gmail.com>
Reviewed and tested by: gregames

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660728 13f79535-47bb-0310-9956-ffa450edef68

17 years agovote and promote
Eric Covener [Tue, 27 May 2008 21:37:57 +0000 (21:37 +0000)] 
vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660724 13f79535-47bb-0310-9956-ffa450edef68

17 years agonote change in r660702
Roy T. Fielding [Tue, 27 May 2008 21:04:33 +0000 (21:04 +0000)] 
note change in r660702

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660704 13f79535-47bb-0310-9956-ffa450edef68

17 years agoBackport r657433 by rpluem
Roy T. Fielding [Tue, 27 May 2008 21:00:16 +0000 (21:00 +0000)] 
Backport r657433 by rpluem

* Include <limits.h> earlier if available since INT_MAX is defined there on
  Windows and we need INT_MAX already for the definition of MAX_REQUESTS.

PR: 45024

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660702 13f79535-47bb-0310-9956-ffa450edef68

17 years agoanother merged with sync of ab
Roy T. Fielding [Tue, 27 May 2008 20:53:01 +0000 (20:53 +0000)] 
another merged with sync of ab

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660699 13f79535-47bb-0310-9956-ffa450edef68

17 years agovote and promote
Roy T. Fielding [Tue, 27 May 2008 20:40:12 +0000 (20:40 +0000)] 
vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660692 13f79535-47bb-0310-9956-ffa450edef68

17 years agoindicate mergepoint for subversion 1.5
Roy T. Fielding [Tue, 27 May 2008 20:26:39 +0000 (20:26 +0000)] 
indicate mergepoint for subversion 1.5

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660685 13f79535-47bb-0310-9956-ffa450edef68

17 years agoNote ab CHANGES
Jim Jagielski [Tue, 27 May 2008 16:27:49 +0000 (16:27 +0000)] 
Note ab CHANGES

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660587 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMerge r652885 from trunk:
Jim Jagielski [Tue, 27 May 2008 16:25:19 +0000 (16:25 +0000)] 
Merge r652885 from trunk:

* Do not allow all options of ALL to be set when only a few of them are
  allowed.

PR: 44262
Submitted by: Micha?\197?\130 Grz?\196?\153dzicki <lazy iq.pl>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660585 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMerge r636386, r636653 from trunk:
Jim Jagielski [Tue, 27 May 2008 16:23:12 +0000 (16:23 +0000)] 
Merge r636386, r636653 from trunk:

* Restore the original request headers if the cached resource was stale, as they
  may be needed by further output filters like the byterange filter to make the
  correct decisions.

PR: 44579

* Do not do Range requests if we use our own conditionals for validating
  a cache entity: If we get 304 the Range does not matter and otherwise the
  entity changed and we want to have the complete entity.

PR: 44579

Submitted by: rpluem
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660584 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMerge r631735 from trunk:
Jim Jagielski [Tue, 27 May 2008 16:21:14 +0000 (16:21 +0000)] 
Merge r631735 from trunk:

* Do not retry a direct connection if the request has a request body

Submitted by: rpluem
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660582 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMerge r617822, r627097, r660207 from trunk:
Jim Jagielski [Tue, 27 May 2008 16:19:22 +0000 (16:19 +0000)] 
Merge r617822, r627097, r660207 from trunk:

* Do not retry a request in the case that we either failed to sent a part of the
  request body or if the request is not idempotent.

PR: 44334

* As per niq's comment, better destinct the types of idempotence.

* Introduce a flag to decide whether we sent an body to the backend or not.

Submitted by: rpluem
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660580 13f79535-47bb-0310-9956-ffa450edef68

17 years agopromote
Jim Jagielski [Tue, 27 May 2008 16:15:40 +0000 (16:15 +0000)] 
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660579 13f79535-47bb-0310-9956-ffa450edef68

17 years agoCast votes...
Jim Jagielski [Tue, 27 May 2008 16:14:48 +0000 (16:14 +0000)] 
Cast votes...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660578 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMass 'ab' backports of:
Jim Jagielski [Tue, 27 May 2008 16:11:36 +0000 (16:11 +0000)] 
Mass 'ab' backports of:

==================
r390504,i r390511, r390519, r394765, r395228, r396300, r413861 | colm

Give users the ability to set the window size for apache bench runs. Useful
for benchmarking largefile downloads.

  * Add siege-like behaviour to ApacheBench; output the results, as they have
    accrued so far, when the user interrupts with ctrl-c. As the signal handler
    is non-reentrant, we don't need volatiles, and the operations all look
    signal-safe.

  * Update the base version, since handling a signal differently is an external
    API change of sorts.

  * set the LastChangedRevision svn property, as ab.c has $Rev $ embedded, so
    it really should be.

when compiling statistics, only interate accross requests which occured.

A keepalive response need not neccessarily have included any content-length
header, handle this case properly for 304 responses. PR39789

==================
r516175 | trawick

ab: Add -r option to continue after socket receive errors.

Submitted by: Filip Hanik <devlist hanik.com>
Reviewed by: trawick

==================
r541138 | sctemme

Explain that POST data should be sent as the correct MIME type.
Submitted by Vincent Bray noodlet at gmail dot com,
edited and reviewed by sctemme

==================
r655214 | fielding

Overhaul ab.c stats collection and reporting to avoid integer
truncation and time divisions within the test loop, retain
native time resolution until output, remove unused data,
avoid structure copies, consistently round milliseconds, and
generally avoid losing accuracy of calculation due to type casts.

Incidentally fixes output bug on gnuplot (seconds were being
output as microseconds).  It would make more sense to output
gnuplot stats as microseconds after the start of test, but
this change returns us to consistency with pre-apr versions of ab.

PR: 44878, 44931.

==================
r655637 | fielding

Don't stop sending a request if EAGAIN is returned, which will only
happen if both the write and subsequent wait are returning EAGAIN,
and count posted bytes correctly when the initial write of a request
is not complete.

PR 10038, 38861, 39679
Submitted by: Patrick McManus <mcmanus datapower.com> (in 2003)
              Stefan Fleiter <stefan.fleiter web.de>  (in 2006)
              and Davanum Srinivas (in 2006).  Committed patch
              contains parts of all three, tweaked by Roy (2008).

==================
r655654 | fielding

Improve client performance by clearing connection pool instead
of destroying it.

PR 40054
Submitted by: Brad Roberts <braddr puremagic.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660576 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMerge r639465 from trunk:
Ruediger Pluem [Tue, 27 May 2008 16:00:11 +0000 (16:00 +0000)] 
Merge r639465 from trunk:

* Initialize hash needed by ap_register_rewrite_mapfunc early enough.

PR: 44641
Submitted by: Daniel Lescohier <daniel.lescohier cnet.com>
Reviewed by: rpluem, niq, wrowe, jim

Submitted by: rpluem
Reviewed by: rpluem, niq, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660572 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMerge r644050 from trunk:
Ruediger Pluem [Tue, 27 May 2008 15:57:23 +0000 (15:57 +0000)] 
Merge r644050 from trunk:

* Prevent a segfault if the destination URI of a copy / move operation is
  not under DAV control. Return 405 (Method not allowed) instead.

PR: 44734

Submitted by: rpluem
Reviewed by: rpluem, niq, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660571 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMerge r657933 from trunk:
Ruediger Pluem [Tue, 27 May 2008 15:54:31 +0000 (15:54 +0000)] 
Merge r657933 from trunk:

* Only send 100-continue if the status code so far indicates success.

PR: 43711

Submitted by: rpluem
Reviewed by: rpluem, niq, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660569 13f79535-47bb-0310-9956-ffa450edef68

17 years agoupdate Turkish translations
Takashi Sato [Tue, 27 May 2008 15:39:20 +0000 (15:39 +0000)] 
update Turkish translations

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@660560 13f79535-47bb-0310-9956-ffa450edef68

17 years agofix garbled ô (&ocirc;)
Takashi Sato [Tue, 27 May 2008 15:05:53 +0000 (15:05 +0000)] 
fix garbled ô (&ocirc;)
PR: 44713

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660550 13f79535-47bb-0310-9956-ffa450edef68

17 years agoCorrect the format errors of revesion reference in translations.
Takashi Sato [Tue, 27 May 2008 14:45:58 +0000 (14:45 +0000)] 
Correct the format errors of revesion reference in translations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660540 13f79535-47bb-0310-9956-ffa450edef68