]> granicus.if.org Git - apache/log
apache
18 years ago* modules/cache/mod_cache.h
Garrett Rooney [Wed, 20 Sep 2006 15:04:38 +0000 (15:04 +0000)]
* modules/cache/mod_cache.h
  (CACHE_DECLARE, CACHE_DECLARE_NONSTD, CACHE_DECLARE_DATA): Remove
   duplicate defines.

Submitted by: Davi Arnaut <davi@haxent.com.br>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@448226 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Set the new environment variable BALANCER_ROUTE_CHANGED if a worker with a
Ruediger Pluem [Sat, 16 Sep 2006 19:49:41 +0000 (19:49 +0000)]
* Set the new environment variable BALANCER_ROUTE_CHANGED if a worker with a
  route different from the one supplied by the client had been chosen or if
  the client supplied no routing information for a balancer with sticky
  sessions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@446929 13f79535-47bb-0310-9956-ffa450edef68

18 years agonote a backport; don't forget that trunk had an additional
Jeff Trawick [Fri, 15 Sep 2006 13:28:40 +0000 (13:28 +0000)]
note a backport; don't forget that trunk had an additional
change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@446609 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* PROXY_WORKER_IS_INITIALIZED checks if PROXY_WORKER_INITIALIZED is set in
Ruediger Pluem [Thu, 14 Sep 2006 22:34:34 +0000 (22:34 +0000)]
* PROXY_WORKER_IS_INITIALIZED checks if PROXY_WORKER_INITIALIZED is set in
  worker->s->status, but we need to check here if it is set in worker->status.

  As PROXY_WORKER_INITIALIZED is set in worker->s->status in
  ap_proxy_initialize_worker_share, which is called just before
  ap_proxy_initialize_worker we never initialize the worker. This is very bad
  as we create no reslist for the pool in this case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@443503 13f79535-47bb-0310-9956-ffa450edef68

18 years agoPR 31759 (mutated) - reported by Jo Rhett
Nick Kew [Tue, 12 Sep 2006 23:44:12 +0000 (23:44 +0000)]
PR 31759 (mutated) - reported by Jo Rhett
Don't return apr_status_t error value from input filter chain.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@442758 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Print the correct error message for erroneous configured ProxyPass directives.
Ruediger Pluem [Sun, 10 Sep 2006 12:37:21 +0000 (12:37 +0000)]
* Print the correct error message for erroneous configured ProxyPass directives.

PR: 40439
Submitted by: serai lans-tv.com
Reviewed by: rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@441947 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAllow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util
Jeff Trawick [Sat, 9 Sep 2006 15:26:05 +0000 (15:26 +0000)]
Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util
statically like the older support programs.

Submitted by: Eric Covener <covener gmail.com>
Reviewed by:  Jeff Trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@441796 13f79535-47bb-0310-9956-ffa450edef68

18 years agoUpdate backports
Jim Jagielski [Wed, 6 Sep 2006 17:38:13 +0000 (17:38 +0000)]
Update backports

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440801 13f79535-47bb-0310-9956-ffa450edef68

18 years agoReplace ap_get_server_version with ap_get_server_banner() and
Jeff Trawick [Tue, 5 Sep 2006 13:08:15 +0000 (13:08 +0000)]
Replace ap_get_server_version with ap_get_server_banner() and
ap_get_server_description().

High-level summary:

The full server version information is now included in the error log at
startup as well as server status reports, irrespective of the setting
of the ServerTokens directive.

Third-party modules must now use ap_get_server_banner() or
ap_get_server_description() in place of ap_get_server_version().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440337 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Extract stickysession information correctly in the case that it is given
Ruediger Pluem [Mon, 4 Sep 2006 19:51:52 +0000 (19:51 +0000)]
* Extract stickysession information correctly in the case that it is given
  as parameter like in the following example:

  www.someplace.com/somewhere/?jsessionid=gggfgdufdfoef.server&parameter=value

  So far we were only able to handle stickysession information encoded in the
  following form:

  www.someplace.com/somewhere/;jsessionid=gggfgdufdfoef.server?parameter=value

PR: 40400

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440160 13f79535-47bb-0310-9956-ffa450edef68

18 years agoHandle filter names which include capital letters.
Jeff Trawick [Mon, 4 Sep 2006 11:08:53 +0000 (11:08 +0000)]
Handle filter names which include capital letters.

PR: 40323

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440028 13f79535-47bb-0310-9956-ffa450edef68

18 years ago Sync these to VC 2005, a .manifest file is created that we need to
William A. Rowe Jr [Sun, 3 Sep 2006 22:59:48 +0000 (22:59 +0000)]
  Sync these to VC 2005, a .manifest file is created that we need to
  invoke the generators

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@439870 13f79535-47bb-0310-9956-ffa450edef68

18 years ago Silence VC2005 faux-errors in pcre with the minimum tweak required.
William A. Rowe Jr [Sat, 2 Sep 2006 19:23:01 +0000 (19:23 +0000)]
  Silence VC2005 faux-errors in pcre with the minimum tweak required.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@439639 13f79535-47bb-0310-9956-ffa450edef68

18 years agoupdate transformation
André Malo [Mon, 28 Aug 2006 18:43:17 +0000 (18:43 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@437774 13f79535-47bb-0310-9956-ffa450edef68

18 years agofix validation error
André Malo [Mon, 28 Aug 2006 18:37:09 +0000 (18:37 +0000)]
fix validation error

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@437773 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMinor nit: why make the logic more complex than it needs to
Jim Jagielski [Mon, 28 Aug 2006 17:57:24 +0000 (17:57 +0000)]
Minor nit: why make the logic more complex than it needs to
be ? :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@437768 13f79535-47bb-0310-9956-ffa450edef68

18 years agoThese have been approved for backport and or in/will be in
Jim Jagielski [Mon, 28 Aug 2006 16:38:01 +0000 (16:38 +0000)]
These have been approved for backport and or in/will be in
2.2.4

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@437749 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Note the changes that were done in revisions
Ruediger Pluem [Mon, 28 Aug 2006 11:29:23 +0000 (11:29 +0000)]
* Note the changes that were done in revisions

  422731
  422736
  422739
  423940
  424759
  424950
  425109
  426790
  426791
  426793
  426795

  (deflate output filter) and

  416165
  426799

  (inflate output filter)

PR: 39854

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@437668 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Close connection to backend if reading of request body fails.
Ruediger Pluem [Thu, 24 Aug 2006 19:53:14 +0000 (19:53 +0000)]
* Close connection to backend if reading of request body fails.

PR: 40310
Submitted by: Ian Abel <ianabel mxtelecom.com>
Reviewed by: rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@434483 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFix contributed by Bjarne D Mathiesen <macintosh@mathiesen.info>
Noirin Plunkett [Wed, 23 Aug 2006 16:20:35 +0000 (16:20 +0000)]
Fix contributed by  Bjarne D Mathiesen <macintosh@mathiesen.info>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@434071 13f79535-47bb-0310-9956-ffa450edef68

18 years agoStale Bugzilla link as noted by Christophe Jaillet
Sander Temme [Tue, 22 Aug 2006 20:41:03 +0000 (20:41 +0000)]
Stale Bugzilla link as noted by Christophe Jaillet

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@433743 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAllow the typical non-DAV methods to be unrestricted
Joshua Slive [Tue, 22 Aug 2006 17:07:54 +0000 (17:07 +0000)]
Allow the typical non-DAV methods to be unrestricted
in our DAV examples (in particular, POST).  Also
change <Location> to <Directory> in the docs.  This
particular example was not a security problem because
<Location> was being used to *extend* access, rather than
to *restrict* access, but it is better to encourage
people to use <Directory> by default.

PR: 40030

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@433694 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMy last effort was a little too succinct and not quite precise
Joshua Slive [Sun, 20 Aug 2006 19:46:24 +0000 (19:46 +0000)]
My last effort was a little too succinct and not quite precise
enough.  Try being more explicit.

This does leave the danger that people will clip the <Location>
example as the proper way to do things, when they should be
reading on to the <Directory> example.  The <Location> example
is only correct when used in conjunction with Alias.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@433021 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd a note about case-sensitivity to the windows platform docs.
Joshua Slive [Sun, 20 Aug 2006 18:48:24 +0000 (18:48 +0000)]
Add a note about case-sensitivity to the windows platform docs.
Partially in response to the disputed vulnerability:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4110

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@433005 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMake it clear that url-path is always case-sensitive.
Joshua Slive [Sun, 20 Aug 2006 18:08:43 +0000 (18:08 +0000)]
Make it clear that url-path is always case-sensitive.
Provide an example of using a regex to make it case-insensitive.
Make it clear that ScriptAlias is only used when you want
BOTH mapping and script-designation.

Partially in response to the disputed vulnerability:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4110

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432997 13f79535-47bb-0310-9956-ffa450edef68

18 years agoupdate convmap
André Malo [Fri, 18 Aug 2006 22:08:26 +0000 (22:08 +0000)]
update convmap

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432743 13f79535-47bb-0310-9956-ffa450edef68

18 years agofix eol-style
André Malo [Fri, 18 Aug 2006 19:16:54 +0000 (19:16 +0000)]
fix eol-style

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432686 13f79535-47bb-0310-9956-ffa450edef68

18 years agoupdate transformation
André Malo [Fri, 18 Aug 2006 18:09:09 +0000 (18:09 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432667 13f79535-47bb-0310-9956-ffa450edef68

18 years agoUpdates docs w/ transforms. Use Andre's patch to lib/DocUtil.pm
Jim Jagielski [Fri, 18 Aug 2006 13:09:12 +0000 (13:09 +0000)]
Updates docs w/ transforms. Use Andre's patch to lib/DocUtil.pm
to work around some OS X issues which mangled paths

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432570 13f79535-47bb-0310-9956-ffa450edef68

18 years agoLog a message if we try to prepare a statement not attached to a hostname.
Nick Kew [Fri, 18 Aug 2006 12:38:28 +0000 (12:38 +0000)]
Log a message if we try to prepare a statement not attached to a hostname.
This fix supplements r432560 (don't crash).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432562 13f79535-47bb-0310-9956-ffa450edef68

18 years agoDon't use NULL s->server_hostname as hash lookup key.
Nick Kew [Fri, 18 Aug 2006 12:16:13 +0000 (12:16 +0000)]
Don't use NULL s->server_hostname as hash lookup key.
Reported by paritosh (at limewire.co.in) on dev@httpd (thread
Re: apache 2.2 crashes at the start time in mod_dbd.c then preparing AuthDBDUserPWQuery)
Fixed by paritosh and Yours Truly.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432560 13f79535-47bb-0310-9956-ffa450edef68

18 years agoUpdate docs and transforms
Jim Jagielski [Thu, 17 Aug 2006 19:41:07 +0000 (19:41 +0000)]
Update docs and transforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432360 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFix context error
Jim Jagielski [Thu, 17 Aug 2006 19:40:17 +0000 (19:40 +0000)]
Fix context error

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432359 13f79535-47bb-0310-9956-ffa450edef68

18 years agoUpdate docs for proxy:
Jim Jagielski [Thu, 17 Aug 2006 19:21:33 +0000 (19:21 +0000)]
Update docs for proxy:

  1. Put params in abc order
  2. Add hot-standby example
  3. Add in new features that hadn't been documented yet (lbset, ...)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432352 13f79535-47bb-0310-9956-ffa450edef68

18 years agoIntroduce a check_config phase between pre_config and open_logs,
Chris Darroch [Mon, 14 Aug 2006 22:55:45 +0000 (22:55 +0000)]
Introduce a check_config phase between pre_config and open_logs,
to allow modules to review interdependent configuration directive
values and adjust them while messages can still be logged to the
console.

The open_logs phase is already used somewhat for this purpose by
certain MPMs (winnt, prefork, worker, and event) but only by forcing
their functions ahead of the core ap_open_logs() function, and
since this phase runs after the ap_signal_server function during startup,
it can not be used to generate messages on the console when restarting.

Add the check_config phase to mod_info and mod_example.

Handle relevant MPM directives during this phase and format messages
for both the console and the error log, as appropriate.  Bounds and sanity
checks on the values of the MPM directives are handled in sequence in
this phase instead of in the various directive handling functions, since
those functions (e.g., set_max_clients()) may not be called at all if their
directives do not appear in the configuration files, and even if they
are called, there is no guarantee that this will occur in any particular
order.

Remove from the worker and event MPMs the code in the pre_config phase
that alters the configuration node tree by re-ordering ThreadsPerChild
ahead of MaxClients.  This code is effective but insufficient; for
example, if ServerLimit follows MaxClients, the test against server_limit
in set_max_clients() is invalid.  (In practice, this only results in
incorrect or absent warnings on the console, because server_limit is
set to its configured value when the main loop re-runs the configuration
process.)

Prevent ap_threads_per_child from exceeding thread_limit in the
winnt, worker, and event MPMs.  This situation could occur if
ThreadsPerChild was not specified in the configuration files and
ThreadLimit was set to a value smaller than DEFAULT_THREADS_PER_CHILD,
because set_threads_per_child() would never be called and therefore
its bounds check against thread_limit would not be performed.

Remove from the winnt, prefork, worker, and event MPMs the
changed_limit_at_restart flag.  Set the first_server_limit and
first_thread_limit values during the first execution of the check_config
function, and use them to detect changes to ServerLimit and ThreadLimit
across restarts and issue appropriately formatted warnings.  Remove the
comments about the error log being a "bit bucket"; this was true when
the code was originally committed in r92530 but that was due to a bug
fixed in r92769.

Be consistent about setting all MPM configuration directive values in the
pre_config phase.

Rephrase and reformat the console and log file messages relating to
MPM configuration directives to be consistent across all MPMs.  Use
briefer messages when logging to the error log than to the console.

Update miscellaneous stale comments and messages (e.g., reference to
daemons_min_free in worker and event MPMs, "prefork open_logs" in
winnt MPM, and StartServers in netware MPM).

The winnt, netware, beos, and mpmt_os2 MPMs should be tested by developers
with access to those platforms, especially the winnt MPM, which has
unique logic with respect to distinguishing between parent and child
processes during the configuration phases.

Update the English documentation for the worker MPM's ThreadsPerChild
directive, which no longer needs to precede other MPM directives in the
configuration files if it has a non-default value.  The German (.de) and
Japanese (.ja) translations should be updated by developers fluent in
those languages.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@431460 13f79535-47bb-0310-9956-ffa450edef68

18 years agoNote bugfix
Nick Kew [Mon, 14 Aug 2006 13:35:03 +0000 (13:35 +0000)]
Note bugfix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@431342 13f79535-47bb-0310-9956-ffa450edef68

18 years agoPR#37770: Don't try to use dead backend connection in proxy
Nick Kew [Mon, 14 Aug 2006 13:26:07 +0000 (13:26 +0000)]
PR#37770: Don't try to use dead backend connection in proxy
(Patch from Olivier BOEL)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@431339 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFix tabs introduced in r429875
Nick Kew [Tue, 8 Aug 2006 23:50:33 +0000 (23:50 +0000)]
Fix tabs introduced in r429875

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@429890 13f79535-47bb-0310-9956-ffa450edef68

18 years agoThat proxy change was functional, even if it was just one character:-)
Nick Kew [Tue, 8 Aug 2006 23:33:21 +0000 (23:33 +0000)]
That proxy change was functional, even if it was just one character:-)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@429883 13f79535-47bb-0310-9956-ffa450edef68

18 years agoPR#38448: don't URLencode tilde in path component
Nick Kew [Tue, 8 Aug 2006 23:27:25 +0000 (23:27 +0000)]
PR#38448: don't URLencode tilde in path component
On reflection, this patch makes sense (since the URL spec got updated), and it's trivial.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@429879 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFix style (indentation at least) to apache style rules before reviewing top of this.
Nick Kew [Tue, 8 Aug 2006 23:18:23 +0000 (23:18 +0000)]
Fix style (indentation at least) to apache style rules before reviewing top of this.
No functional change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@429875 13f79535-47bb-0310-9956-ffa450edef68

18 years ago Observed by hunter - fix the cut n paste errors in some .res compilation
William A. Rowe Jr [Sat, 5 Aug 2006 20:04:40 +0000 (20:04 +0000)]
  Observed by hunter - fix the cut n paste errors in some .res compilation
  steps of the win32 build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@429038 13f79535-47bb-0310-9956-ffa450edef68

18 years ago Document that httpd -L doesn't list shared modules.
Chris Pepper [Sat, 5 Aug 2006 02:53:59 +0000 (02:53 +0000)]
Document that httpd -L doesn't list shared modules.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428941 13f79535-47bb-0310-9956-ffa450edef68

18 years agorevert the definitive bit for the reject directive.
Bradley Nicholes [Fri, 4 Aug 2006 17:56:50 +0000 (17:56 +0000)]
revert the definitive bit for the reject directive.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428800 13f79535-47bb-0310-9956-ffa450edef68

18 years agorevert the reject directive is definitive patch and normalize the logic lists.
Bradley Nicholes [Fri, 4 Aug 2006 17:53:27 +0000 (17:53 +0000)]
revert the reject directive is definitive patch and normalize the logic lists.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428798 13f79535-47bb-0310-9956-ffa450edef68

18 years agoInitialization change. Move to a different format
Jim Jagielski [Thu, 3 Aug 2006 11:41:14 +0000 (11:41 +0000)]
Initialization change. Move to a different format
to force resets as well as a common technique, in case
_route is updated at some point.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428361 13f79535-47bb-0310-9956-ffa450edef68

18 years agoReset standby flags for each loop through the cluster sets
Jim Jagielski [Thu, 3 Aug 2006 11:30:11 +0000 (11:30 +0000)]
Reset standby flags for each loop through the cluster sets

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428352 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* modules/proxy/mod_proxy.c (proxysection): Fix another strchr() warning.
Joe Orton [Thu, 3 Aug 2006 09:33:35 +0000 (09:33 +0000)]
* modules/proxy/mod_proxy.c (proxysection): Fix another strchr() warning.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428291 13f79535-47bb-0310-9956-ffa450edef68

18 years agoDo not return on WAIT_ABANDONED signals.
Mladen Turk [Thu, 3 Aug 2006 08:24:44 +0000 (08:24 +0000)]
Do not return on WAIT_ABANDONED signals.
It means that we got the ownership, not that the
object was signaled.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428278 13f79535-47bb-0310-9956-ffa450edef68

18 years agofix typo
Bradley Nicholes [Wed, 2 Aug 2006 21:50:08 +0000 (21:50 +0000)]
fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428163 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Followup patch on r427959:
Ruediger Pluem [Wed, 2 Aug 2006 21:19:09 +0000 (21:19 +0000)]
* Followup patch on r427959:
  Also substitute close_on_recycle with close in mod_proxy_fcgi. This makes
  mod_proxy_fcgi compile again.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428152 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFix return values from wait_for_many_objects.
Mladen Turk [Wed, 2 Aug 2006 15:31:24 +0000 (15:31 +0000)]
Fix return values from wait_for_many_objects.
The return value is index to the signaled thread in
the creted_threads array.
We can not use WAIT_TIMEOUT as return value
because its value is defined as 258, thus limiting
the MaxThreads to that value that leads to the
assertion errors.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428029 13f79535-47bb-0310-9956-ffa450edef68

18 years agoRevert the patch. Although the problem still exists
Mladen Turk [Wed, 2 Aug 2006 14:41:31 +0000 (14:41 +0000)]
Revert the patch. Although the problem still exists
its root cause is inside the wait_for_many_objects.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428009 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFix the assertion if the WaitForMutipleObjects
Mladen Turk [Wed, 2 Aug 2006 14:36:24 +0000 (14:36 +0000)]
Fix the assertion if the WaitForMutipleObjects
returns WAIT_ABANDONED_NN instead presumed
WAIT_OBJECT_NN. This will correctly close the thread
handle without using invalid thread handle array index.

Spotted when large balancer timeout was set
and all the threads were busy waiting for the
connection:
[Wed Aug 02 14:29:58 2006] [crit] [Wed Aug 02 14:29:58 2006] file \\build-2.2.2\\server\\mpm\\winnt\\child.c, line 1120, assertion "(rv >= 0) && (rv < threads_created)" failed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428008 13f79535-47bb-0310-9956-ffa450edef68

18 years agoCleanup: Remove close_on_recycle from proxy_conn_rec.
Mladen Turk [Wed, 2 Aug 2006 12:03:42 +0000 (12:03 +0000)]
Cleanup: Remove close_on_recycle from proxy_conn_rec.
It behaves the same as close.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427959 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMake sure the error signature is logged as double
Mladen Turk [Wed, 2 Aug 2006 10:42:07 +0000 (10:42 +0000)]
Make sure the error signature is logged as double
hex byte.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427951 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAllow optional name=value options within <Proxy
Mladen Turk [Wed, 2 Aug 2006 07:59:47 +0000 (07:59 +0000)]
Allow optional name=value options within <Proxy
section line. Additional arguments are allowed
only for 'standard' url's, meaning that the wildchar
urls will return error like before.
This allow to specify the worker/balancer parameters
on the definition line, without the need for extra
ProxySet options.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427928 13f79535-47bb-0310-9956-ffa450edef68

18 years agoEnable ProxySet inside <Proxy> section to
Mladen Turk [Wed, 2 Aug 2006 06:54:01 +0000 (06:54 +0000)]
Enable ProxySet inside <Proxy> section to
create balancer or worker if they were not
already created.
This allows to have ProxySet directive before
BalancerMember directives inside Proxy section.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427920 13f79535-47bb-0310-9956-ffa450edef68

18 years agofix a typo
Bradley Nicholes [Tue, 1 Aug 2006 23:05:48 +0000 (23:05 +0000)]
fix a typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427783 13f79535-47bb-0310-9956-ffa450edef68

18 years agoConverted the reject directive to be definitive and enabled directory_merge to merge...
Bradley Nicholes [Tue, 1 Aug 2006 22:54:38 +0000 (22:54 +0000)]
Converted the reject directive to be definitive and enabled directory_merge to merge all of the authorization rules and logic.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427780 13f79535-47bb-0310-9956-ffa450edef68

18 years agoGood catch by Ruediger
Jim Jagielski [Mon, 31 Jul 2006 23:46:55 +0000 (23:46 +0000)]
Good catch by Ruediger

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427368 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd in a very simple balancer "set" concept, which allows
Jim Jagielski [Mon, 31 Jul 2006 17:01:40 +0000 (17:01 +0000)]
Add in a very simple balancer "set" concept, which allows
for members to be assigned to a particular cluster set
such that members in lower-numbered sets are checked/used
before those in higher ones.

Also bundled in this are some HTML cleanups for the balancer
manager UI. Sorry for the mixins :)

Compiles/builds clean: passes test framework as well
as more normal usage tests ;)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427172 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFix compile time warning. AJP protocol method is byte.
Mladen Turk [Mon, 31 Jul 2006 09:42:57 +0000 (09:42 +0000)]
Fix compile time warning. AJP protocol method is byte.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427059 13f79535-47bb-0310-9956-ffa450edef68

18 years agoCleanup: Remove checking for pre 2.0.46 MMN. It is
Mladen Turk [Mon, 31 Jul 2006 09:33:28 +0000 (09:33 +0000)]
Cleanup: Remove checking for pre 2.0.46 MMN. It is
obvious that the new mod_proxy will never be
backported to the 2.0 branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427055 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Rework inflate out filter and give it a similar workflow as the deflate out
Ruediger Pluem [Sat, 29 Jul 2006 13:24:37 +0000 (13:24 +0000)]
* Rework inflate out filter and give it a similar workflow as the deflate out
  filter. This fixes the following bugs in the inflate out filter:

  - Incorrect handling of flush buckets.
  - Excessive memory usage for large compressed content (because we now
    already sent parts down the chain and do not process the whole brigade
    first before sending something down the chain).
  - Handle the case correctly where the validation bytes at the end of
    the compressed data stream are distributed across different buckets /
    brigades.
  - Fix a memory leak due to not cleaning up the internal structures of
    libz in some error cases.

PR: 39854

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@426799 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* some optimizations taken from the inflate out filter
Ruediger Pluem [Sat, 29 Jul 2006 13:08:38 +0000 (13:08 +0000)]
* some optimizations taken from the inflate out filter

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@426795 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* We can ignore Z_BUF_ERROR in flush_libz_buffer because:
Ruediger Pluem [Sat, 29 Jul 2006 13:03:43 +0000 (13:03 +0000)]
* We can ignore Z_BUF_ERROR in flush_libz_buffer because:
  When we call libz_func we can assume that

   - avail_in is zero (due to the surrounding code that calls
     flush_libz_buffer)
   - avail_out is non zero due to the fact that we just emptied
     the output buffer and stored it into a brigade

  So the only reason for Z_BUF_ERROR is that the internal libz
  buffers are now empty and thus we called libz_func one time
  too often. This does not hurt. It simply says that we are done.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@426793 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Use a define for the number of validation bytes (CRC and length) after the
Ruediger Pluem [Sat, 29 Jul 2006 12:55:26 +0000 (12:55 +0000)]
* Use a define for the number of validation bytes (CRC and length) after the
  compressed data

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@426791 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Add parameter crc to flush_libz_buffer in order to call the libz's crc32
Ruediger Pluem [Sat, 29 Jul 2006 12:49:51 +0000 (12:49 +0000)]
* Add parameter crc to flush_libz_buffer in order to call the libz's crc32
  function on the output buffer if needed. This is actually needed by the
  later rework of the inflate out filter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@426790 13f79535-47bb-0310-9956-ffa450edef68

18 years ago Wrong project name
William A. Rowe Jr [Thu, 27 Jul 2006 17:05:59 +0000 (17:05 +0000)]
  Wrong project name

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@426142 13f79535-47bb-0310-9956-ffa450edef68

18 years agoSECURITY: CVE-2006-3747 (cve.mitre.org)
Mark J. Cox [Thu, 27 Jul 2006 17:03:34 +0000 (17:03 +0000)]
SECURITY: CVE-2006-3747 (cve.mitre.org)
mod_rewrite: Fix an off-by-one security problem in the ldap scheme
handling.  For some RewriteRules this could lead to a pointer being
written out of bounds.  Reported by Mark Dowd of McAfee.

Ack: trawick, lars, jorton, wrowe, benl

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@426138 13f79535-47bb-0310-9956-ffa450edef68

18 years agoDocument new ping parameter.
Mladen Turk [Thu, 27 Jul 2006 08:09:02 +0000 (08:09 +0000)]
Document new ping parameter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425999 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Remove all filters that are before the cache_out filter. This ensures
Ruediger Pluem [Wed, 26 Jul 2006 17:33:38 +0000 (17:33 +0000)]
* Remove all filters that are before the cache_out filter. This ensures
  that we kick off the filter stack with our cache_out filter being the
  first in the chain. This make sense because we want to restore things
  in the same manner as we saved them.
  There may be filters before our cache_out filter, because

  1. We call ap_set_content_type during cache_select. This causes
     Content-Type specific filters to be added.
  2. We call the insert_filter hook. This causes filters e.g. like
     the ones set with SetOutputFilter to be added.

PR: 40090

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425787 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Sync with 2.2.x CHANGES
Ruediger Pluem [Wed, 26 Jul 2006 14:24:32 +0000 (14:24 +0000)]
* Sync with 2.2.x CHANGES

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425742 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Sync with 2.2.x CHANGES file
Ruediger Pluem [Wed, 26 Jul 2006 13:13:19 +0000 (13:13 +0000)]
* Sync with 2.2.x CHANGES file

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425728 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd missing prototype for ajp_handle_cping_cpong function
Mladen Turk [Wed, 26 Jul 2006 09:25:19 +0000 (09:25 +0000)]
Add missing prototype for ajp_handle_cping_cpong function

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425690 13f79535-47bb-0310-9956-ffa450edef68

18 years agoNote backport
Nick Kew [Wed, 26 Jul 2006 08:08:22 +0000 (08:08 +0000)]
Note backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425663 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd missing svn:eol-style native properties.
Mladen Turk [Wed, 26 Jul 2006 07:15:32 +0000 (07:15 +0000)]
Add missing svn:eol-style native properties.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425648 13f79535-47bb-0310-9956-ffa450edef68

18 years agoremove BOM
Jim Jagielski [Wed, 26 Jul 2006 05:36:01 +0000 (05:36 +0000)]
remove BOM

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425634 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFix warning on Darwin 8.7.0 (OS X 10.4.7) due to the prototype for
Roy T. Fielding [Wed, 26 Jul 2006 00:40:53 +0000 (00:40 +0000)]
Fix warning on Darwin 8.7.0 (OS X 10.4.7) due to the prototype for
sendfile_nonblocking being declared outside ifdefs even though the
function is defined and used only when APR_HAS_SENDFILE

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425571 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdjust the svn properties.
Mladen Turk [Tue, 25 Jul 2006 23:49:39 +0000 (23:49 +0000)]
Adjust the svn properties.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425559 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd ajp_utils to the list of ajp objects.
Mladen Turk [Tue, 25 Jul 2006 20:59:20 +0000 (20:59 +0000)]
Add ajp_utils to the list of ajp objects.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425523 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdded cping/cpong support for the AJP protocol.
Mladen Turk [Tue, 25 Jul 2006 16:50:07 +0000 (16:50 +0000)]
Added cping/cpong support for the AJP protocol.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425454 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd mod_authz_core module to the build.
Mladen Turk [Tue, 25 Jul 2006 15:59:43 +0000 (15:59 +0000)]
Add mod_authz_core module to the build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425433 13f79535-47bb-0310-9956-ffa450edef68

18 years agoOops. Something went wrong with the merge.
Mladen Turk [Tue, 25 Jul 2006 15:29:32 +0000 (15:29 +0000)]
Oops. Something went wrong with the merge.
Use the original ~nf.default.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425423 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd mod_access_conf to the build.
Mladen Turk [Tue, 25 Jul 2006 15:27:17 +0000 (15:27 +0000)]
Add mod_access_conf to the build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425422 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd mod_access_conf module base address.
Mladen Turk [Tue, 25 Jul 2006 15:26:45 +0000 (15:26 +0000)]
Add mod_access_conf module base address.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425421 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd mod_access_conf to the build.
Mladen Turk [Tue, 25 Jul 2006 15:26:14 +0000 (15:26 +0000)]
Add mod_access_conf to the build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425420 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Although the lstat call should rarely ever fail, because we stat'ed the
Ruediger Pluem [Tue, 25 Jul 2006 13:40:32 +0000 (13:40 +0000)]
* Although the lstat call should rarely ever fail, because we stat'ed the
  same file several lines above, check the return value to be save that
  nothing bad happens in the case it does fail.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425394 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd a check to make sure that the base provider and the alias names are different...
Bradley Nicholes [Mon, 24 Jul 2006 22:33:43 +0000 (22:33 +0000)]
Add a check to make sure that the base provider and the alias names are different and also that the alias has not been registered before

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425210 13f79535-47bb-0310-9956-ffa450edef68

18 years agoScriptSock has been global-only for a couple of years
Jeff Trawick [Mon, 24 Jul 2006 17:23:37 +0000 (17:23 +0000)]
ScriptSock has been global-only for a couple of years
now; fix the docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425124 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Rather use a pool cleanup function than calling deflateEnd before every
Ruediger Pluem [Mon, 24 Jul 2006 16:17:12 +0000 (16:17 +0000)]
* Rather use a pool cleanup function than calling deflateEnd before every
  return from function to ensure that libz's internals get cleaned up.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425109 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Fix typo. No functional change.
Ruediger Pluem [Mon, 24 Jul 2006 14:09:27 +0000 (14:09 +0000)]
* Fix typo. No functional change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425057 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Fixed typo. No functional change.
Ruediger Pluem [Mon, 24 Jul 2006 13:40:14 +0000 (13:40 +0000)]
* Fixed typo. No functional change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425052 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Initialize zRC to avoid a compiler warning.
Ruediger Pluem [Mon, 24 Jul 2006 07:43:40 +0000 (07:43 +0000)]
* Initialize zRC to avoid a compiler warning.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424950 13f79535-47bb-0310-9956-ffa450edef68

18 years agoreflect backports of two MPM fixes
Jeff Trawick [Mon, 24 Jul 2006 01:44:35 +0000 (01:44 +0000)]
reflect backports of two MPM fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424877 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFinish reverting r410758.
Joshua Slive [Sun, 23 Jul 2006 21:23:49 +0000 (21:23 +0000)]
Finish reverting r410758.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424824 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Style police / style nitpicking. No functional changes.
Ruediger Pluem [Sun, 23 Jul 2006 21:22:37 +0000 (21:22 +0000)]
* Style police / style nitpicking. No functional changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424823 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Initialize pkcs7 field of structure
Ruediger Pluem [Sun, 23 Jul 2006 21:11:22 +0000 (21:11 +0000)]
* Initialize pkcs7 field of structure

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424821 13f79535-47bb-0310-9956-ffa450edef68

18 years agoUse the 2.3-style access control properly (I hope).
Joshua Slive [Sun, 23 Jul 2006 21:10:05 +0000 (21:10 +0000)]
Use the 2.3-style access control properly (I hope).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424819 13f79535-47bb-0310-9956-ffa450edef68