]> granicus.if.org Git - apache/log
apache
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

18 years agoBackout r410758 because DavLockDB needs to point to an httpd-writable
Joshua Slive [Sun, 23 Jul 2006 21:00:58 +0000 (21:00 +0000)]
Backout r410758 because DavLockDB needs to point to an httpd-writable
directory and @exp_runtimedir@ doesn't qualify.  Also document a
missing module requirement.

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

18 years agoRecord bugfix
Nick Kew [Sun, 23 Jul 2006 20:27:36 +0000 (20:27 +0000)]
Record bugfix

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

18 years agoRemove dependence on server config from ap_dbd_prepare, as that may
Nick Kew [Sun, 23 Jul 2006 20:22:57 +0000 (20:22 +0000)]
Remove dependence on server config from ap_dbd_prepare, as that may
be called in per-directory config functions where there is no
server context causing segfault.
Discussion at
http://mail-archives.apache.org/mod_mbox/httpd-dev/200607.mbox/<831327593.20060720023332%40engec.ru>
and subsequent thread.

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

18 years ago* This shortcut is too short. It is not up to the filters to decide
Ruediger Pluem [Sun, 23 Jul 2006 15:50:08 +0000 (15:50 +0000)]
* This shortcut is too short. It is not up to the filters to decide
  whether filters down the chain can do something useful with this empty
  brigade.

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

18 years agoLayout and compiler warning.
Ben Laurie [Sun, 23 Jul 2006 13:17:28 +0000 (13:17 +0000)]
Layout and compiler warning.

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

18 years agoAdd PKCS#7 support.
Ben Laurie [Sun, 23 Jul 2006 10:55:07 +0000 (10:55 +0000)]
Add PKCS#7 support.

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

18 years ago Simplify; installtest was an -artifact-, not a design decision :-)
William A. Rowe Jr [Sun, 23 Jul 2006 08:59:14 +0000 (08:59 +0000)]
  Simplify; installtest was an -artifact-, not a design decision :-)

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

18 years agoFix the typo (probably). The %~na is something windows
Mladen Turk [Sun, 23 Jul 2006 08:36:06 +0000 (08:36 +0000)]
Fix the typo (probably). The %~na is something windows
help for batch files does not recognize.
Anyhow, renaming to the %~nf there is no more
%~na.default file generated inside conf/extra on install.

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

18 years agoFix targets so that InstallBin calls the conf install,
Mladen Turk [Sun, 23 Jul 2006 08:24:23 +0000 (08:24 +0000)]
Fix targets so that InstallBin calls the conf install,
as well as installr and installd.

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

18 years ago* Remove the word SECURITY to address Joe's and Bill's concern that this would
Ruediger Pluem [Thu, 20 Jul 2006 22:04:13 +0000 (22:04 +0000)]
* Remove the word SECURITY to address Joe's and Bill's concern that this would
  imply that FollowSymLinks and SymLinksIfOwnerMatch are security features.

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

18 years ago* In preparation of the changes of the inflate out filter:
Ruediger Pluem [Thu, 20 Jul 2006 14:11:48 +0000 (14:11 +0000)]
* In preparation of the changes of the inflate out filter:
  - rename flush_zlib_buffer to flush_libz_buffer (this name seems
    better)
  - add a parameter to tell flush_libz_buffer whether it should
    deflate or inflate as this function should be also used for the
    inflate out filter.

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

18 years ago* Check for symbolic links of the target file in the optimized case that we
Ruediger Pluem [Thu, 20 Jul 2006 11:01:07 +0000 (11:01 +0000)]
* Check for symbolic links of the target file in the optimized case that we
  had already done this specific directory walk for this request. This can
  happen when we have an internal redirect, like the ones caused by mod_dir
  (/ -> index.html). See also

  http://mail-archives.apache.org/mod_mbox/httpd-dev/200607.mbox/%3c44B5521F.8050906@globalvanet.com%3e

Reviewed by: wrowe

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

18 years ago Alas, it was not to be. Deprecate mod_aspdotnet, and certainly don't
William A. Rowe Jr [Wed, 19 Jul 2006 07:05:13 +0000 (07:05 +0000)]
  Alas, it was not to be.  Deprecate mod_aspdotnet, and certainly don't
  introduce these docs into the next release or consider for backport.

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

18 years agoRevert r422298, because it introduces GNU Make specific extensions to the Makefile...
Paul Querna [Tue, 18 Jul 2006 00:11:46 +0000 (00:11 +0000)]
Revert r422298, because it introduces GNU Make specific extensions to the Makefile, and should be replaced by doing the work inside configure, instead of the Makefile.in.

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

18 years ago* Remove ourselves from the filter chain if we failed to init libz, as we
Ruediger Pluem [Mon, 17 Jul 2006 15:24:29 +0000 (15:24 +0000)]
* Remove ourselves from the filter chain if we failed to init libz, as we
  pass data down the filter chain uncompressed afterwards.

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

18 years ago* Fix potential memory leaks in deflate_out_filter if bailing out due to an
Ruediger Pluem [Mon, 17 Jul 2006 15:08:27 +0000 (15:08 +0000)]
* Fix potential memory leaks in deflate_out_filter if bailing out due to an
  error (either in the lower filter chain or during a libz operation). We need
  to call deflateEnd as it is very likely that this filter is never called
  again to ensures that libz's internal structures get cleaned properly.

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

18 years ago* Fix wrong FLUSH bucket handling in deflate_out_filter: Actually the internal
Ruediger Pluem [Mon, 17 Jul 2006 14:32:50 +0000 (14:32 +0000)]
* Fix wrong FLUSH bucket handling in deflate_out_filter: Actually the internal
  structures of libz never got flushed as ctx->stream.avail_in is always zero
  here. As the EOS and the FLUSH bucket case use the same code for flushing
  libz's internal buffers move this code to the new function flush_zlib_buffer.

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

18 years agogen_test_char doesn't actually need the util_debug object to work.
Paul Querna [Sat, 15 Jul 2006 22:36:12 +0000 (22:36 +0000)]
gen_test_char doesn't actually need the util_debug object to work.

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

18 years agoMakefile.in: Don't try to compile checkgid and fcgistarter on win32 when using the...
Paul Querna [Sat, 15 Jul 2006 22:05:02 +0000 (22:05 +0000)]
Makefile.in: Don't try to compile checkgid and fcgistarter on win32 when using the autotools build system.
/support: Update svn:ignore for generated exe files

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

18 years agoDisable the getpwnam and getgrnam functions, since they aren't available on win32.
Paul Querna [Sat, 15 Jul 2006 10:01:33 +0000 (10:01 +0000)]
Disable the getpwnam and getgrnam functions, since they aren't available on win32.

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

18 years agoinclude/ap_config.h: Include the autoconf generated header that defines what is avail...
Paul Querna [Sat, 15 Jul 2006 09:47:11 +0000 (09:47 +0000)]
include/ap_config.h: Include the autoconf generated header that defines what is available.

configure.in: The times function is not really available on mingw32. Disable em.

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

18 years agoOn mingw32, the APACHE_MPM_DIR is defined from the autoconf generated files.
Paul Querna [Sat, 15 Jul 2006 09:25:28 +0000 (09:25 +0000)]
On mingw32, the APACHE_MPM_DIR is defined from the autoconf generated files.

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

18 years agoBring in basic support for building the winnt MPM under mingw32, using the autoconf...
Paul Querna [Sat, 15 Jul 2006 09:03:52 +0000 (09:03 +0000)]
Bring in basic support for building the winnt MPM under mingw32, using the autoconf build system.  Currently this will get you to the point of linking errors on gen_test_char.

configure.in: Default to winnt MPM on mingw32 hosts.
configure.in: Add AP_DECLARE_EXPORT for mingw32 hsots.

os/config.m4: Use win32 dir under mingw32.
os/win32/Makefile.in: Add in a new makefile to generate libos on win32.

server/mpm/config.m4: Add winnt MPM to the help string.
server/mpm/config.m4: winnt MPM is a threaded MPM.

server/mpm/winnt/child.c: SO_UPDATE_ACCEPT_CONTEXT is defined under a different header in mingw32.

server/mpm/winnt/{Makefile.in,config.m4}: Base build for winnt MPM.

os/win32,server/mpm/winnt: Update svn:ignore for .deps/.libs

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

18 years agoUse <string.h>-compatible versions of ap_str* functions.
Nick Kew [Sat, 15 Jul 2006 08:39:41 +0000 (08:39 +0000)]
Use <string.h>-compatible versions of ap_str* functions.

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

18 years agoDon't down cast
Jim Jagielski [Fri, 14 Jul 2006 17:34:59 +0000 (17:34 +0000)]
Don't down cast

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

18 years ago Refresh some language for windows builders
William A. Rowe Jr [Fri, 14 Jul 2006 00:00:50 +0000 (00:00 +0000)]
  Refresh some language for windows builders

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

18 years agoTypo fix
Nick Kew [Thu, 13 Jul 2006 22:59:46 +0000 (22:59 +0000)]
Typo fix

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

18 years agoSupport environment variable interpolation in reverse proxy configuration
Nick Kew [Thu, 13 Jul 2006 19:00:26 +0000 (19:00 +0000)]
Support environment variable interpolation in reverse proxy configuration

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

18 years agoGuess I should document the mod_proxy_balancer changes
Jim Jagielski [Wed, 12 Jul 2006 19:31:58 +0000 (19:31 +0000)]
Guess I should document the mod_proxy_balancer changes

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

18 years agoThe number of times elected as well as the i/o
Jim Jagielski [Wed, 12 Jul 2006 15:13:22 +0000 (15:13 +0000)]
The number of times elected as well as the i/o
of the workers is useful info to show in the
manager.

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

18 years agoIt never fails. I sit on a patch for awhile and
Jim Jagielski [Wed, 12 Jul 2006 15:01:15 +0000 (15:01 +0000)]
It never fails. I sit on a patch for awhile and
it's not until almost right after I commit it that
I think "hey, there's a better way to do that."
Anyway, I was never happy about the code
duplication of the primary/standby checks...
This fixes that.

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

18 years agoIssue a warning when the same worker name is reused.
Jean-Frederic Clere [Wed, 12 Jul 2006 12:08:36 +0000 (12:08 +0000)]
Issue a warning when the same worker name is reused.

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

18 years agoupdate revision references
André Malo [Wed, 12 Jul 2006 05:37:53 +0000 (05:37 +0000)]
update revision references

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