Commit Graph

15768 Commits

Author SHA1 Message Date
9ebb12e675 Create a development branch for the efforts to refactor the mod_cache storage engines (disk,memory) to be more generic places to stick data.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/cache-refactor@446636 13f79535-47bb-0310-9956-ffa450edef68
2006-09-15 15:35:27 +00:00
f188bb425e 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
2006-09-15 13:28:40 +00:00
7361c75b95 * 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
2006-09-14 22:34:34 +00:00
8c2b72b53c 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
2006-09-12 23:44:12 +00:00
ef038e0617 * 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
2006-09-10 12:37:21 +00:00
01a2b32113 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
2006-09-09 15:26:05 +00:00
ab0c428cb4 Update backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440801 13f79535-47bb-0310-9956-ffa450edef68
2006-09-06 17:38:13 +00:00
743a621e8d 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
2006-09-05 13:08:15 +00:00
3397848717 * 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
2006-09-04 19:51:52 +00:00
6790cc32bc 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
2006-09-04 11:08:53 +00:00
0b2fa0173b 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
2006-09-03 22:59:48 +00:00
0162304773 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
2006-09-02 19:23:01 +00:00
7add40d118 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@437774 13f79535-47bb-0310-9956-ffa450edef68
2006-08-28 18:43:17 +00:00
40712b8afe fix validation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@437773 13f79535-47bb-0310-9956-ffa450edef68
2006-08-28 18:37:09 +00:00
3f66c0200f 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
2006-08-28 17:57:24 +00:00
9b69763832 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
2006-08-28 16:38:01 +00:00
ff563f2e22 * 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
2006-08-28 11:29:23 +00:00
4d2639fa95 * 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
2006-08-24 19:53:14 +00:00
308ea46dea 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
2006-08-23 16:20:35 +00:00
d8bd09073d 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
2006-08-22 20:41:03 +00:00
86319c427d 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
2006-08-22 17:07:54 +00:00
53133772ac 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
2006-08-20 19:46:24 +00:00
51a32c4551 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
2006-08-20 18:48:24 +00:00
1f2b32f04e 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
2006-08-20 18:08:43 +00:00
9db2cce5ed update convmap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432743 13f79535-47bb-0310-9956-ffa450edef68
2006-08-18 22:08:26 +00:00
cab0f8754c fix eol-style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432686 13f79535-47bb-0310-9956-ffa450edef68
2006-08-18 19:16:54 +00:00
99b0930065 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432667 13f79535-47bb-0310-9956-ffa450edef68
2006-08-18 18:09:09 +00:00
611d2fc34b 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
2006-08-18 13:09:12 +00:00
5c94bb0140 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
2006-08-18 12:38:28 +00:00
07e5187677 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
2006-08-18 12:16:13 +00:00
a187478d9e Update docs and transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432360 13f79535-47bb-0310-9956-ffa450edef68
2006-08-17 19:41:07 +00:00
40cde75faf Fix context error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432359 13f79535-47bb-0310-9956-ffa450edef68
2006-08-17 19:40:17 +00:00
62cb62c571 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
2006-08-17 19:21:33 +00:00
e69f467709 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
2006-08-14 22:55:45 +00:00
4304af36d9 Note bugfix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@431342 13f79535-47bb-0310-9956-ffa450edef68
2006-08-14 13:35:03 +00:00
3b19271873 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
2006-08-14 13:26:07 +00:00
d160248d92 Fix tabs introduced in r429875
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@429890 13f79535-47bb-0310-9956-ffa450edef68
2006-08-08 23:50:33 +00:00
1e2d246c20 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
2006-08-08 23:33:21 +00:00
047253e8a8 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
2006-08-08 23:27:25 +00:00
537844367d 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
2006-08-08 23:18:23 +00:00
f4d7f73505 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
2006-08-05 20:04:40 +00:00
d0566d6509 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
2006-08-05 02:53:59 +00:00
e6d2a7d4df 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
2006-08-04 17:56:50 +00:00
7159a46f37 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
2006-08-04 17:53:27 +00:00
3eeb5a123b 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
2006-08-03 11:41:14 +00:00
585f146b66 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
2006-08-03 11:30:11 +00:00
b3265c64fb * 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
2006-08-03 09:33:35 +00:00
496195bdd8 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
2006-08-03 08:24:44 +00:00
601c29aedc fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428163 13f79535-47bb-0310-9956-ffa450edef68
2006-08-02 21:50:08 +00:00
18748acaa6 * 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
2006-08-02 21:19:09 +00:00