]>
granicus.if.org Git - apache/log
Ryan Bloom [Mon, 27 Aug 2001 06:00:51 +0000 (06:00 +0000)]
Allow mod_ssl to send back an error message if an HTTP request is sent
over an HTTPS connection. This also adds an ap_remove_input_filter
function, which should be used to remove the SSL input filter in this
case, as soon as this code is stressed a bit more.
For right now, we are sending the same message that we used to send in
mod_ssl for Apache 1.3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90724
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Aug 2001 05:33:30 +0000 (05:33 +0000)]
Regroup some of the headers in the win32 module, to make the distinction
between modules/http and server/ a bit clearer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90721
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Aug 2001 04:51:58 +0000 (04:51 +0000)]
Final additional comments (for the moment) about the new optimization.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90716
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Mon, 27 Aug 2001 04:47:17 +0000 (04:47 +0000)]
Remove some unneeded autoconf checks. We now have no duplicate libraries
in the generated EXTRA_LIBS in config_vars.mk (at least on Linux 2.4).
APR already determines if we need nsl, socket - checking for it in httpd
is merely redundant.
None of the code in httpd-2.0 seems to deal with HAVE_GMTOFF as all of
that code was moved to APR a long time ago.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90715
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Aug 2001 04:37:40 +0000 (04:37 +0000)]
Further optimization to location_walk() and clean up unused variables.
We will note the end result of the merge, and if remains the same through
the second pass, we have nothing whatsoever to do :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90714
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Aug 2001 04:29:09 +0000 (04:29 +0000)]
Clean up location_walk, so that this step performs a minimum
amount of redundant effort (it must be run twice, but it will no
longer reparse all <Location > blocks when the request uri
hadn't changed.)
The location walk block is refactored, with some significant changes
in variable names for legibility. Cooler still, it uses pool data
instead of 'notes' for the important cache info :)
Note the patch builds the <Location > per dir config from _nothing_,
and then merges it into the per_dir_config. When the underlying
per_dir_config changes between passes, the location_walk can simply
tack back on this preconstruct onto the new per_dir_config.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90713
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 27 Aug 2001 03:35:51 +0000 (03:35 +0000)]
Fix a typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90712
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Aug 2001 02:57:54 +0000 (02:57 +0000)]
I think this statement makes more sense, please ask if it isn't clear.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90711
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 26 Aug 2001 20:09:52 +0000 (20:09 +0000)]
backing out the ap_set_keepalive uncheck for Content-Length header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90707
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 26 Aug 2001 18:57:16 +0000 (18:57 +0000)]
ap_content_length_filter has already set Content-Length
before ap_set_keepalive is called. need to remove this check
in order for keepalives to work.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90700
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 26 Aug 2001 17:38:14 +0000 (17:38 +0000)]
apr_pstrcat args were not NULL terminated
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90698
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Sun, 26 Aug 2001 16:28:19 +0000 (16:28 +0000)]
More fixes for APXS. APXS now works with httpd-test again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90697
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Sun, 26 Aug 2001 06:25:00 +0000 (06:25 +0000)]
Improvements to APXS. It now uses the config_vars.mk variables to
figure out how to build stuff. It uses the Apache build system for
the generated module, but not for command line builds. Maybe I'll fix
that one day. If somebody wants to beat me to it, that would be cool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90696
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 26 Aug 2001 06:01:59 +0000 (06:01 +0000)]
these modules were never built and had not been ported to 2.0
they have been ported and moved to httpd-test
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90695
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Sun, 26 Aug 2001 05:25:31 +0000 (05:25 +0000)]
Another generated file to ignore.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90687
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 26 Aug 2001 05:21:50 +0000 (05:21 +0000)]
Toggle the /Zi flag to allow all supportd versions of VC (5, 6, 7) to
build 'out of the box' in debugging mode.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90686
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 26 Aug 2001 05:15:09 +0000 (05:15 +0000)]
That last round calls for a bump.
bump.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90685
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 26 Aug 2001 05:10:17 +0000 (05:10 +0000)]
Eliminate proxy: (and all other 'special') processing from the
ap_directory_walk() phase. Modules that want to use special
walk logic should refer to the mod_proxy map_to_location example,
with it's proxy_walk and proxysection implementation. This makes
either directory_walk flavor much more legible, since that phase
only runs against real <Directory > blocks.
On a technical note, this patch also forces the Directory to be
canonical (unless it is "/" or a regex.) It also allows us to
be more explicit when declaring <Directory > block errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90684
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 26 Aug 2001 04:59:37 +0000 (04:59 +0000)]
Readded "downgrade-1.0" which I (inadvertantly) pulled with the
map_to_storage patch. I knew it had to have a better home, and
it sure looks like this is it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90683
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 26 Aug 2001 04:39:35 +0000 (04:39 +0000)]
Split proxy: space using <Proxy[Match] > directive blocks from
the <Directory[Match] > and <Files[Match] > blocks. Mod_proxy
now bypasses the directory and files testing phase (and skips
the http TRACE default handler on it's own, as well). Note that
<Location > blocks continue to be processed for proxy: requests.
Remaining questions include canonicalization and case folding
of proxied uri space, prior to the proxy_walk testing and the
second <Location > walk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90678
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 26 Aug 2001 03:58:52 +0000 (03:58 +0000)]
Change _only_ the debug build to recognize the /Zi flag (which is portable
for debugging between VC 5.0/6.0/7.0) instead of the VC 6.0+ specific /ZI.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90675
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Sun, 26 Aug 2001 03:13:36 +0000 (03:13 +0000)]
We have to initialize the error_bucket before we can destroy it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90674
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 26 Aug 2001 01:24:41 +0000 (01:24 +0000)]
didt pay attention to the first question; pretty sure answer is no
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90673
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 26 Aug 2001 01:17:32 +0000 (01:17 +0000)]
i think the answer to aaron's question is "a typo". otherwise there is
actually 1 less thread available to serve requests than configured.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90670
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Sun, 26 Aug 2001 00:00:39 +0000 (00:00 +0000)]
Fix a security problem which would allow an SSI document
to be passed to the client unparsed.
Reported by: Brian Pane
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90668
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 25 Aug 2001 23:43:19 +0000 (23:43 +0000)]
Introduce the map_to_storage hook, which allows modules to bypass
the directory_walk and file_walk for non-file requests. TRACE
shortcut moved to http_protocol.c as APR_HOOK_MIDDLE, and the
directory_walk/file_walk happen as APR_HOOK_VERY_LAST in core.c.
A seperate patch to mod_proxy is required to short circuit both the
TRACE and directory_walk/file_walk stuff. That patch is next.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90665
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Sat, 25 Aug 2001 22:56:22 +0000 (22:56 +0000)]
BUCKETS SMS PHASE 1
Update to match apr-util
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90664
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 25 Aug 2001 18:46:16 +0000 (18:46 +0000)]
Added documentation of RemoveCharset, RemoveLanguage to mod_mime.html.
Added links to directives.html.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90661
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 25 Aug 2001 17:48:52 +0000 (17:48 +0000)]
Downgrade must occur before we attempt to TRACE, e.g., for clients with
broken chunking.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90658
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 25 Aug 2001 13:27:12 +0000 (13:27 +0000)]
Additional details in mod_mime about what all this stuff means.
Reviewed by: Joshua Slive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90657
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Sat, 25 Aug 2001 10:19:51 +0000 (10:19 +0000)]
os-inline.c is no more...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90656
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Sat, 25 Aug 2001 05:26:05 +0000 (05:26 +0000)]
Add the ability for mod_include to add the INCLUDES filter
if the file is configured for the server-parsed handler.
This makes the configuration for .shtml files much easier
to understand, and allows mod_include to honor Apache 1.3
config files. Based on Doug MacEachern's patch to PHP
to do the same thing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90655
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 23:25:14 +0000 (23:25 +0000)]
force OpenSSL to ignore process local-caching and to always
get/set/delete sessions using mod_ssl's callbacks
PR:
Obtained from:
Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by: dougm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90654
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 23:17:22 +0000 (23:17 +0000)]
these #ifs were really confusing emacs indentation, easier for humans to parse this way too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90653
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 24 Aug 2001 21:45:28 +0000 (21:45 +0000)]
look for config.guess in apr's build dir
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90650
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Fri, 24 Aug 2001 20:38:27 +0000 (20:38 +0000)]
Just a little extra commentary...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90649
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Fri, 24 Aug 2001 20:27:40 +0000 (20:27 +0000)]
Fix a double-free condition when byterange requests are made on brigades
containing any bucket that cannot be copied natively (ie, pipe or socket
buckets).
Before, we were reading that bucket to morph it to a heap bucket and then
taking the str that heap bucket points to and placing it in a second,
completely separate heap bucket. That means we'd have two apr_bucket/
apr_bucket_heap pairs each with a refcount of 1 (rather than two apr_buckets
and a single apr_bucket_heap with a refcount of 2). str would then be
doubly-freed when the second of those two buckets was destroyed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90648
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 24 Aug 2001 18:12:02 +0000 (18:12 +0000)]
sec, sec, who's got a sec? This gave me a headache, but I had to clear
out the last patch before I rearranged this to be _readable_.
Next step for everyone's sanity, provide <Proxy > directives ;)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90646
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 18:06:47 +0000 (18:06 +0000)]
enable i/o debugging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90645
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 24 Aug 2001 18:01:25 +0000 (18:01 +0000)]
Commit this code before another patch becomes to difficult to follow.
This patch does one thing, it changes the root path "/" to reflect an
element count of Zero (0). directory_walk will always accept the zero
element (which sorts first, thankfully) on it's first go around.
So, Unix will accept "/" when it's parsing it's first element "/".
Dos/Win32 will accept "/" and "C:/" when they parse their first element,
"C:/". The root sorted first, so it behaves as users expect.
The syntax "//" or "//machine" will be depreciated for now, the user
needs to set up the extact "//machine/share/" that they want served
on Win32.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90644
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Fri, 24 Aug 2001 17:27:42 +0000 (17:27 +0000)]
One thing done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90643
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 24 Aug 2001 17:21:39 +0000 (17:21 +0000)]
Fix seg fault when requesting a page that returns a 'don't cache' header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90642
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 17:17:35 +0000 (17:17 +0000)]
churn_output should return the value of ap_pass_brigade
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90640
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Fri, 24 Aug 2001 17:08:25 +0000 (17:08 +0000)]
Point to the new FAQ.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90639
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Fri, 24 Aug 2001 17:07:36 +0000 (17:07 +0000)]
Remove the old FAQ.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90638
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 24 Aug 2001 17:01:21 +0000 (17:01 +0000)]
Eliminate a cache_handle leak. cache_handle is now allocated out of the
request pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90637
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 24 Aug 2001 16:57:13 +0000 (16:57 +0000)]
Eliminate compile warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90636
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Fri, 24 Aug 2001 16:49:39 +0000 (16:49 +0000)]
Make the worker MPM shutdown and restart cleanly. This also
cleans up some race conditions, and gets the worker using
pools more cleanly.
Submitted by: [Aaron Bannert <aaron@clove.org>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90635
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 24 Aug 2001 16:46:43 +0000 (16:46 +0000)]
mod_mem_cache
allow it to be enabled
don't segfault if we don't have/need a lock
clear up several compile warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90634
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 24 Aug 2001 16:33:10 +0000 (16:33 +0000)]
Uninstall the filter if the caching layer declines the cache request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90633
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 24 Aug 2001 15:15:57 +0000 (15:15 +0000)]
Cleanup a few compile warnings...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90632
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 24 Aug 2001 15:14:43 +0000 (15:14 +0000)]
Fix a seg fault.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90631
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Fri, 24 Aug 2001 13:48:53 +0000 (13:48 +0000)]
Another style improvement.
Submitted by: Rich Bowen
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90630
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 24 Aug 2001 13:14:19 +0000 (13:14 +0000)]
APR returns APR_EOF, not EOF...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90629
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 24 Aug 2001 11:35:58 +0000 (11:35 +0000)]
temporarily back out the buffering of .var files while folks
have a chance to get APR ungetc working properly on buffered
files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90628
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 24 Aug 2001 10:40:04 +0000 (10:40 +0000)]
protect const-ness of variant->file_name by using ap_strchr_c() instead
of strchr()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90627
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 06:58:00 +0000 (06:58 +0000)]
ssl_var_lookup() is enabled
apr optional functions do not need to be unregistered
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90625
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 06:47:35 +0000 (06:47 +0000)]
fix bogus include recursion error when q->uri and rr->uri are both:
"INTERNALLY GENERATED file-relative req"
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90624
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 06:34:26 +0000 (06:34 +0000)]
apr_os_thread_current() call needs #if APR_HAS_THREADS protection
PR:
Obtained from:
Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90622
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 06:22:09 +0000 (06:22 +0000)]
fix prototype
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90621
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 06:15:39 +0000 (06:15 +0000)]
implement CRYPTO_set_id_callback
PR:
Obtained from:
Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by: dougm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90620
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 05:31:51 +0000 (05:31 +0000)]
change APR_LOCKALL to APR_INTRAPROCESS for crypto locks
PR:
Obtained from:
Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90618
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Fri, 24 Aug 2001 04:50:49 +0000 (04:50 +0000)]
Sanitize all the wacky indentation in this block prior to commiting
the real fix. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90616
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 04:16:57 +0000 (04:16 +0000)]
only set the crypto locking callback if mpm is threaded
get rid of some warnings introduced by the original patch
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90614
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 24 Aug 2001 04:16:29 +0000 (04:16 +0000)]
Add the config of the ForceLanguagePriority directive, since we seem
to agree on what it does. My last question is where do I force this
behavior without tons of extra filesystem/cpu consumption?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90613
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 04:08:04 +0000 (04:08 +0000)]
Implement CRYPTO_set_locking_callback() for mod_ssl
PR:
Obtained from:
Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by: dougm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90612
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 24 Aug 2001 03:45:21 +0000 (03:45 +0000)]
Will I ever get my str*cmp semantics right? Not at this hour...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90611
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 24 Aug 2001 03:40:18 +0000 (03:40 +0000)]
My initial changes failed to accomodate this faux entry.
If you didn't see any <Directory > blocks working right, try
this cvs update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90610
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 24 Aug 2001 03:04:44 +0000 (03:04 +0000)]
buffer .var maps to avoid asking the kernel for one byte at a
time
note that a system trace of .var map processing still shows an
extra read() after we hit EOF the first time; we could make
use of the EOF flag in APR to avoid the read() or play with
mod_negotiation
Suggested by: Marc Slemko
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90609
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 24 Aug 2001 03:02:57 +0000 (03:02 +0000)]
This flag is no more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90608
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Fri, 24 Aug 2001 02:24:54 +0000 (02:24 +0000)]
Somebody please get me a copy editor.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90606
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 24 Aug 2001 01:41:56 +0000 (01:41 +0000)]
Revert this patch. It indicates some fundamental brokenness with the
apr_filepath_root() fn, which should simply return '/' for an absolute
path on (most) unix, and advance the path pointer to the first non-'/'
character [if only Win32 and others were so simple ;-]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90605
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Fri, 24 Aug 2001 01:26:31 +0000 (01:26 +0000)]
I don't know if this is the Right Way, but it certainly does make things
work better right now. httpd-test is much much happier with this patch
(ie, we can serve pages again :) I'm still seeing issues with mod_include,
but that's probably a different problem... will investigate.
Submitted by: Doug MacEachern
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90603
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 24 Aug 2001 00:59:08 +0000 (00:59 +0000)]
I'm still not 100% certain on this test. Regardless, it doesn't impact
Unix, and this was the bug that Jeff's (none the less correct) fix masked.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90601
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 24 Aug 2001 00:47:09 +0000 (00:47 +0000)]
fix what would seem to be a serious problem in
split_and_pass_pretag_buckets(): the retcode is not
specified on one of the paths
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90600
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 24 Aug 2001 00:09:30 +0000 (00:09 +0000)]
support "SSLVerifyClient optional_no_ca"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90599
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Aug 2001 23:49:41 +0000 (23:49 +0000)]
fix fubar with recent commit to ap_core_translate()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90598
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 23 Aug 2001 23:43:45 +0000 (23:43 +0000)]
prevent double lookup of ssl::verify::error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90597
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Thu, 23 Aug 2001 22:37:00 +0000 (22:37 +0000)]
sc->szPassPhraseDialogPath is now constified, so we have to use
ap_strchr_c instead of strchr (which == ap_strchr on my system).
Submitted by: Ryan Bloom
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90595
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 22:19:49 +0000 (22:19 +0000)]
Fix my typo (I invented the silly constant, you would expect me to recall it.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90594
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 22:17:19 +0000 (22:17 +0000)]
Increase security in core.c by testing (as we merge the path) that the
URI does not go above the DocumentRoot (as defined by the OS, not by
the URI specification), and give us the true name.
When we are done, note the name is canonical for directory_walk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90593
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 21:58:07 +0000 (21:58 +0000)]
Whoops. To explain, we won't dup filename unless it really didn't match
in the first place. We are about to abuse test_filename, so don't try
using that copy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90592
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 21:56:36 +0000 (21:56 +0000)]
Start with the presumption that canonical_filename is not likely to be set.
Therefore we will canonicalize it when it doesn't match filename.
The next optimization should take the path common to canonical_filename
and filename, and start merging filename from there for canonicalization.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90591
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 21:21:17 +0000 (21:21 +0000)]
Another spot we are certain of the canonical_filename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90590
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 21:17:38 +0000 (21:17 +0000)]
We already extract e for subprocess_env, and set SECURE_SERVER_PORT
for real.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90589
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 21:16:05 +0000 (21:16 +0000)]
Why two ifdef blocks? This is simpler to read
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90588
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Thu, 23 Aug 2001 21:06:02 +0000 (21:06 +0000)]
Another small faq change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90587
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 21:05:42 +0000 (21:05 +0000)]
Two cases we are certain of canonical correctness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90586
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 21:03:44 +0000 (21:03 +0000)]
Add a canonical_filename value (should remain the r->filename identity)
so we can tell if a 3rd party module broke the canonical form of the
filename by not calling apr_filepath_merge().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90585
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Thu, 23 Aug 2001 21:02:55 +0000 (21:02 +0000)]
wrong url
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90584
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 21:01:11 +0000 (21:01 +0000)]
Better doc of ap_server_root_relative()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90583
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Thu, 23 Aug 2001 21:01:02 +0000 (21:01 +0000)]
Update support info.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90582
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Aug 2001 20:29:47 +0000 (20:29 +0000)]
please no // in Apache code... it doesn't compile everywhere
a note about why it is commented out would be appropriate too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90581
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Aug 2001 20:15:56 +0000 (20:15 +0000)]
make it compile :(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90580
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Aug 2001 19:46:55 +0000 (19:46 +0000)]
mod_cache cleanup:
change the module variable from tcache_module to cache_module
clear up various gcc warnings
don't segfault when the silly user (me) configures CACHE_OUT
manually
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90579
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 23 Aug 2001 19:45:17 +0000 (19:45 +0000)]
os-inline.c is no more (fix from bloom)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90578
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 19:42:44 +0000 (19:42 +0000)]
Add some appropriate constness to the config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90577
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 23 Aug 2001 19:37:23 +0000 (19:37 +0000)]
at least try to compile all the parts of mod_cache when it is
requested
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90576
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 19:35:23 +0000 (19:35 +0000)]
Silly compiler, const char* is for text :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90575
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Aug 2001 19:29:45 +0000 (19:29 +0000)]
I _like_ malloca(), but it needs an include
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90574
13f79535 -47bb-0310-9956-
ffa450edef68