]>
granicus.if.org Git - apache/log
Doug MacEachern [Wed, 27 Mar 2002 06:01:03 +0000 (06:01 +0000)]
fix doofo in last commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94218
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 05:58:31 +0000 (05:58 +0000)]
sslc 1.x does not have an x509v3.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94217
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 05:50:56 +0000 (05:50 +0000)]
sslc does not currently support X509V3_EXT_d2i
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94216
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 04:02:46 +0000 (04:02 +0000)]
toolkit compat for PEM_read_bio_PrivateKey
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94215
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:58:26 +0000 (03:58 +0000)]
use compat macro for another PEM_read_bio_X509
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94214
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:56:02 +0000 (03:56 +0000)]
toolkit compat for PEM_read_bio_X509
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94213
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:46:36 +0000 (03:46 +0000)]
adjust to another const char vs char mismatch between OpenSSL and sslc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94212
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:42:21 +0000 (03:42 +0000)]
use SSL_SESSION_ api since SSL_SESSION cannot be dereferenced when using sslc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94211
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:33:57 +0000 (03:33 +0000)]
typo fix s/EDG/EGD/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94210
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:31:23 +0000 (03:31 +0000)]
modssl_set_cipher_list was in the wrong place for OpenSSL
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94209
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:28:52 +0000 (03:28 +0000)]
RAND_status macro was in the wrong place
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94208
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:27:13 +0000 (03:27 +0000)]
sslc does not currently support RAND_egd or RAND_status
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94207
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:13:32 +0000 (03:13 +0000)]
in sslc PEM_F_DEF_CALLBACK == PEM_F_DEF_CB
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94206
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:11:22 +0000 (03:11 +0000)]
2nd arg to SSL_set_cipher_list in sslc is char *
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94205
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:09:11 +0000 (03:09 +0000)]
sslc 1.x SSL_set_verify only takes 2 args
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94204
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:04:24 +0000 (03:04 +0000)]
sslc does not currently implement an SSL_set_state function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94203
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:02:10 +0000 (03:02 +0000)]
sslc adds a second, unused param to X509_verify_cert
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94202
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 02:53:38 +0000 (02:53 +0000)]
sslc does not have a safestack.h, implement a minimal subset required
for mod_ssl
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94201
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 02:50:43 +0000 (02:50 +0000)]
some compat macros for sslc 1.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94200
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 02:28:15 +0000 (02:28 +0000)]
moving OpenSSL+sslc compat foo to ssl_toolkit_compat.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94199
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 01:58:15 +0000 (01:58 +0000)]
3rd arg of BIO callbacks in 'const char' in OpenSSL and 'char' in sslc,
make both happy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94198
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 01:50:43 +0000 (01:50 +0000)]
OpenSSL uses void * for callback data, sslc uses char *,
cast to void * to make both happy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94197
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 01:28:20 +0000 (01:28 +0000)]
add modssl_session_get_time() function to give mod_ssl what it needs
from SSL_SESSION_get_time() if using OpenSSL or sslc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94195
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 00:46:07 +0000 (00:46 +0000)]
another step towards compatiblity with rsa sslc:
define the STACK_OF macro if not already defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94194
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 00:32:07 +0000 (00:32 +0000)]
configure already checks OpenSSL version so dont bother here
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94193
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Wed, 27 Mar 2002 00:28:07 +0000 (00:28 +0000)]
Anal-retentive factor -- be consistent in our whitespace.
Reviewed by: Greg Stein
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94192
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 26 Mar 2002 20:41:11 +0000 (20:41 +0000)]
Up to .35 [no need to call out .35-dev in changes, that's just silly.]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94191
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 26 Mar 2002 20:35:51 +0000 (20:35 +0000)]
Ready for .34 evaluation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94190
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 26 Mar 2002 20:13:37 +0000 (20:13 +0000)]
Somewhere about server/main.c rev 1.54, we lost the stop|shutdown|uninstall
when the .conf file is missing or horribly corrupt. Move those actions
into the rewrite args phase so we don't trip over a missing .conf file,
we couldn't care less if we are stopping/uninstalling Apache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94189
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Tue, 26 Mar 2002 19:43:46 +0000 (19:43 +0000)]
Ensure that the build directory is created when using VPATH.
Previously, configure would try to write config_vars.mk into build
without ensuring that that directory existed first.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94188
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Tue, 26 Mar 2002 18:41:14 +0000 (18:41 +0000)]
Add text/xml, audio/mpeg, video/quicktime support to mime magic file.
(Justin changed the audio/mpeg sequence to match file(1)'s listing.)
Minor style changes in nearby areas.
PR: 7730
Submitted by: Linus Walleij <triad@df.lth.se>
Reviewed by: Justin Erenkrantz
(forward ported from revision 1.5 of apache-1.3/conf/magic)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94187
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Tue, 26 Mar 2002 18:17:57 +0000 (18:17 +0000)]
make it harder for spammers to harvest this email address in the future.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94184
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 26 Mar 2002 17:29:36 +0000 (17:29 +0000)]
note about the temporary DH keys
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94181
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 26 Mar 2002 17:17:27 +0000 (17:17 +0000)]
a few updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94180
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 26 Mar 2002 16:57:49 +0000 (16:57 +0000)]
per-dir SSLCACertificate{File,Path} cannot use SSL_CTX_set_cert_store
as the 1.x based module does, since the function is not thread-safe.
a patch has been submitted to OpenSSL to support SSL_set_cert_store
which is thread safe. this feature is enabled by default in the
current 1.x based module, we only enable it if the SSL_set_cert_store
function is available.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94179
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Tue, 26 Mar 2002 16:53:24 +0000 (16:53 +0000)]
Fixed up the access paths for building the code generation utilities
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94178
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 26 Mar 2002 15:49:37 +0000 (15:49 +0000)]
constificationization of some char * config items
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94177
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 26 Mar 2002 15:42:21 +0000 (15:42 +0000)]
performance enhancement: mod_ssl config directives that can have both
a per-server and per-dir context were configuring the per-dir context
for per-server commands. this triggered ssl_hook_Access to always
compare the per-server context against per-dir configs that were
exactly the same.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94176
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 26 Mar 2002 00:49:37 +0000 (00:49 +0000)]
correct comment in previous change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94171
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 26 Mar 2002 00:30:47 +0000 (00:30 +0000)]
PR:
Obtained from:
Submitted by:
Reviewed by:
fix bug seen on win32 with netscape client where output filter is run
triggered by lingering_close after ssl_hook_CloseConnection has been called
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94170
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 25 Mar 2002 19:05:59 +0000 (19:05 +0000)]
-i and -u were deprecated some time ago, they still work in 1.3, but
shouldn't be expected to work in 2.0. Replacement command line options
are -k install|uninstall
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94161
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 25 Mar 2002 19:04:28 +0000 (19:04 +0000)]
Integrate rbb's forward port of -k config into the -h(elp), and
reorder some directives in the -h(elp) so they 'flow'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94160
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Striker [Mon, 25 Mar 2002 09:50:41 +0000 (09:50 +0000)]
Better test for the presence of $(sbindir) since that is where
we are going to install.
Submitted by: Thom May <thom@planetarytramp.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94159
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Mon, 25 Mar 2002 07:37:34 +0000 (07:37 +0000)]
nit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94157
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Mon, 25 Mar 2002 07:20:45 +0000 (07:20 +0000)]
Fix a segfault because ap_method_registry_init() was never called unless
ap_method_register() was called [ie, unless mod_dav was installed]
Reported by: Brian Pane
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94156
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Mon, 25 Mar 2002 01:10:06 +0000 (01:10 +0000)]
What, we don't support HEAD requests now? ;)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94154
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Sun, 24 Mar 2002 06:42:14 +0000 (06:42 +0000)]
Small performance optimization for find_end_sequence(): when we find
the start of a directive, scan through the rest of it in a minimal
loop before popping back out to the main char-at-a-time parser loop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94153
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 24 Mar 2002 02:55:35 +0000 (02:55 +0000)]
eliminate unused variables
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94152
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Sat, 23 Mar 2002 23:19:41 +0000 (23:19 +0000)]
Changed mod_cgi to not do single-byte reads to consume the
script headers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94151
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 23 Mar 2002 13:06:30 +0000 (13:06 +0000)]
eliminate an unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94146
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Sat, 23 Mar 2002 06:03:37 +0000 (06:03 +0000)]
Eliminate an 8KB buffer from the stack in mod_info's handler function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94145
13f79535 -47bb-0310-9956-
ffa450edef68
Richard Bowen [Sat, 23 Mar 2002 03:23:15 +0000 (03:23 +0000)]
Completed going through mod/code.xml ensuring that every directive
contains at least one example. A little additional clarification a few
places. Updates STATUS to reflect the status of this task.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94144
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Fri, 22 Mar 2002 21:45:44 +0000 (21:45 +0000)]
We have to return valid HTTP status codes from filters. This fixes two
cases in the core_output_filters where there was a problem, and the core
returned an error code instead of an HTTP status code. This keeps us from
putting status codes like 32 and 104 in the access log.
Submitted by: Ryan Morgan <rmorgan@covalent.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94143
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Mar 2002 21:41:14 +0000 (21:41 +0000)]
fix some abuse of apr_port_t (flagged by Sun WorkShop)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94142
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Mar 2002 20:37:04 +0000 (20:37 +0000)]
add an extra level of parentheses to say "yes I know what I'm
doing with that single '='" and more importantly to quiet a
gcc -Wall warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94141
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 22 Mar 2002 20:24:22 +0000 (20:24 +0000)]
Tag some pools
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94140
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 22 Mar 2002 20:23:00 +0000 (20:23 +0000)]
Tag some pools.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94139
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 22 Mar 2002 19:35:47 +0000 (19:35 +0000)]
record a vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94138
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 Mar 2002 19:01:54 +0000 (19:01 +0000)]
Reclasses and notes; cheers reverberate through the cybersphere.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94134
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 22 Mar 2002 18:34:46 +0000 (18:34 +0000)]
When a proxied site was being served, Apache was replacing
the original site Server header with it's own, which is not
allowed by RFC2616. Fixed.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94133
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 22 Mar 2002 16:15:43 +0000 (16:15 +0000)]
Not a showstopper IMO. But posting a patch anyway...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94130
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 22 Mar 2002 15:22:24 +0000 (15:22 +0000)]
Yep, it's cold today in Raleigh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94129
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 22 Mar 2002 15:13:14 +0000 (15:13 +0000)]
Vote and remove from showstopper status the win32 install PRs. Those will be fixed
in the installer after the Apache tarball is rolled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94128
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 22 Mar 2002 15:05:21 +0000 (15:05 +0000)]
comment on a "showstopper" which is apparantly dormant.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94127
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Mar 2002 14:34:13 +0000 (14:34 +0000)]
cold
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94126
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Mar 2002 11:45:26 +0000 (11:45 +0000)]
get the prototype for ap_set_content_type()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94125
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 Mar 2002 06:51:52 +0000 (06:51 +0000)]
An error is an error. Since we replace the message with 'failed to
invoke command; ...' we aught to log it at the right level.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94122
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 Mar 2002 06:09:39 +0000 (06:09 +0000)]
Trace the invoked command when we use CreateProcess()-style emulation
of execxx() for apr_proc_create().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94119
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 Mar 2002 05:52:16 +0000 (05:52 +0000)]
Err, that was a bit redundant. Eliminate the redundant test [and clean
up some tabs I inadvertantly introduced.]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94118
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Mar 2002 03:43:22 +0000 (03:43 +0000)]
document yet another worker MPM glitch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94117
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Mar 2002 02:56:56 +0000 (02:56 +0000)]
Fix a mod_cgid problem that left daemon processes stranded
in some server restart scenarios.
It relied on getting SIGHUP to die, but it wasn't careful
about establishing the SIGHUP handling it needed so after
apachectl restart, SIGHUP was ignored since the new cgid
daemon process inherited a signal(SIGHUP,SIG_IGN) done by
the MPM during its restart logic.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94116
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 22 Mar 2002 02:51:27 +0000 (02:51 +0000)]
One showstopper down...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94115
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 22 Mar 2002 02:48:00 +0000 (02:48 +0000)]
Use the accessor to set r->content_type
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94114
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Fri, 22 Mar 2002 01:28:01 +0000 (01:28 +0000)]
Port the -k config option to Apache 2.0. This allows users to reconfigure
their service after it has been installed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94113
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Mar 2002 01:12:49 +0000 (01:12 +0000)]
remove some unnecessary, commented-out code; add a comment
about a use of signals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94112
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Mar 2002 00:59:23 +0000 (00:59 +0000)]
the mod_ssl provided with Apache >= 2.0 no longer has an independent
version number
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94111
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 Mar 2002 20:38:02 +0000 (20:38 +0000)]
things are looking up...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94109
13f79535 -47bb-0310-9956-
ffa450edef68
Aaron Bannert [Thu, 21 Mar 2002 19:40:06 +0000 (19:40 +0000)]
Added exp_foo and rel_foo variables to config_vars.mk for all Apache and
Autoconf path variables (like --sysconfdir, --sbindir, etc). exp_foo is
the "expanded" version, which means that all internal variable references
have been interpolated. rel_foo is the same as $exp_foo, only relative
to $prefix if they share a common path.
This will be used in apxs.in and apachectl.in to allow Apache installs
to be relocated as long as the same relative directory structure remains.
Currently this is only possible if you use the Apache layout, but not
with other layouts or any overridden --foodir paths.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94108
13f79535 -47bb-0310-9956-
ffa450edef68
Aaron Bannert [Thu, 21 Mar 2002 19:23:39 +0000 (19:23 +0000)]
Allow spaces in the --prefix-like arguments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94107
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 Mar 2002 19:12:54 +0000 (19:12 +0000)]
Don't drop connections during graceful restart. Previously, worker
threads could exit even though there were connections waiting in the
queue.
Now, for a graceful restart the worker threads won't exit until they
are told that the queue has been drained and no more connections will
ever be added.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94106
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 Mar 2002 16:31:39 +0000 (16:31 +0000)]
graceful shutdown (no dropped connections) requires that the listener
go away before the workers... introduce separate XXX_may_exit flags
for our different categories of threads so that a future fix for
graceful shutdown can terminate them in the right order
rename signal_workers() to signal_threads() and give it a parameter
so it knows whether or not termination should be graceful
this commit doesn't change the behavior in any noticeable way; the
flags used to tell threads to go away are still set at about the same
time
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94095
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 Mar 2002 16:18:11 +0000 (16:18 +0000)]
document a glitch that prevents complete graceful termination of the
process when one of the threads encounters a critical error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94094
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 Mar 2002 16:06:51 +0000 (16:06 +0000)]
make the comment for the call to apr_signal_thread() a little more
correct about what it is going to do
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94091
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 Mar 2002 15:27:31 +0000 (15:27 +0000)]
fix a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94088
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 Mar 2002 15:19:54 +0000 (15:19 +0000)]
axe some unused fields in ap_queue_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94087
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 21 Mar 2002 12:05:45 +0000 (12:05 +0000)]
Change the header merging behaviour in proxy, as some headers
(like Set-Cookie) cannot be unmerged due to stray commas in
dates.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94083
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Striker [Thu, 21 Mar 2002 10:10:41 +0000 (10:10 +0000)]
Update callers of apr_explode_gmt to apr_time_exp_gmt. The
function was renamed in apr.
Submitted by: Thom May <thom@planetarytramp.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94081
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 21 Mar 2002 05:28:48 +0000 (05:28 +0000)]
Now-meaningless-commentary.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94071
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 21 Mar 2002 05:28:14 +0000 (05:28 +0000)]
Correct our list of escape characters to include percent and the
carriage return on Win32/OS2, and modify the \r \n escaping to account
for the fact that Win32/OS2 don't pass these characters through a true
argv[] mechansim; replace them with a whitespace since they effectively
are for most applications.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94070
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Thu, 21 Mar 2002 04:17:11 +0000 (04:17 +0000)]
Performance optimization: use a temp buffer on the stack instead
of a malloc'ed buffer in regexec() in cases where the required
buffer size is small.
This will help us avoid a malloc/free pair when executing mod_rewrite
rules that use $1/$2/etc to reference sequences in the matched pattern.
Note: I've also submitted this change as a patch for PCRE, but because
the next PCRE release isn't planned until later this year I'm
committing it to the httpd-2.0 copy of PCRE in the meantime.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94069
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 Mar 2002 03:40:23 +0000 (03:40 +0000)]
don't log a failure of ap_queue_pop() at termination; it is
expected
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94068
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 20 Mar 2002 23:29:13 +0000 (23:29 +0000)]
in a worker thread, don't dare try to process a connection if
ap_queue_pop() failed... csd is not cleared by ap_queue_pop()
so checking csd is not helpful
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94067
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 20 Mar 2002 23:28:05 +0000 (23:28 +0000)]
Update license description for PCRE inclusion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94066
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 20 Mar 2002 22:19:11 +0000 (22:19 +0000)]
Fold the compiled-in knowledge of the allowable AcceptMutex settings into
its help entry. Requires the use of a extern string rather than a function
call for the initialization to be valid in the macro (Thx to Jeff!).
In the meantime, bump down the error logging until we deal with true
default and configured setting information ala 1.3.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94062
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 20 Mar 2002 20:38:52 +0000 (20:38 +0000)]
no need to kill the scoreboard cleanup anymore on graceful
restart; the scoreboard is longer-lived
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94061
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 20 Mar 2002 20:30:46 +0000 (20:30 +0000)]
ap_create_scoreboard() now initializes the scoreboard if it already exists,
so MPMs shouldn't call it for a graceful restart
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94060
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 20 Mar 2002 19:53:18 +0000 (19:53 +0000)]
write a debug message to the log when we're stuck in the sicko state
of trying to take over scoreboard slots that aren't going to be released
(we could also be stalled while taking over slots if a thread in child
gracefully terminating is serving a long-running request)
update a comment describing the sicko state to remove any information
I'm not absolutely sure of
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94059
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Wed, 20 Mar 2002 19:04:24 +0000 (19:04 +0000)]
Fix the build on Win32 by syncing up the .hw headers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94058
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 20 Mar 2002 17:44:13 +0000 (17:44 +0000)]
Commit 2 of 2 to:
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments to aligh with ap_set_content_length
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94057
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 20 Mar 2002 17:41:55 +0000 (17:41 +0000)]
Commit 1 of 2 to:
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments on the call to aligh with ap_set_content_length
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94056
13f79535 -47bb-0310-9956-
ffa450edef68