]> granicus.if.org Git - apache/log
apache
22 years agoripping out some proxy stuff that isn't currently in use and is going
Doug MacEachern [Thu, 28 Mar 2002 17:23:50 +0000 (17:23 +0000)]
ripping out some proxy stuff that isn't currently in use and is going
to change anyhow.

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

22 years agoalready added configure check for SSL_set_cert_store
Doug MacEachern [Thu, 28 Mar 2002 17:16:41 +0000 (17:16 +0000)]
already added configure check for SSL_set_cert_store

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

22 years agode-hungarian-ize server config member names which are going to stay
Doug MacEachern [Thu, 28 Mar 2002 17:11:12 +0000 (17:11 +0000)]
de-hungarian-ize server config member names which are going to stay

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

22 years agoreorder a bit of the server config structure, moving items that are
Doug MacEachern [Thu, 28 Mar 2002 16:47:36 +0000 (16:47 +0000)]
reorder a bit of the server config structure, moving items that are
going to stay there to the top.

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

22 years agosignature of quick_handler hook changed
Jeff Trawick [Thu, 28 Mar 2002 11:17:59 +0000 (11:17 +0000)]
signature of quick_handler hook changed

(mod_example's quick_handler hook doesn't have to do anything
with the new parameter)

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

22 years agoremove error msg hint that is no longer true
Doug MacEachern [Thu, 28 Mar 2002 02:51:52 +0000 (02:51 +0000)]
remove error msg hint that is no longer true

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

22 years agofixup naming:
Doug MacEachern [Thu, 28 Mar 2002 02:46:28 +0000 (02:46 +0000)]
fixup naming:
 ssl_init_ctx_* will be used for both proxy and server
 ssl_init_server_* is specific to the server

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

22 years agomove context callback setting to ssl_init_ctx_callbacks function
Doug MacEachern [Thu, 28 Mar 2002 02:40:01 +0000 (02:40 +0000)]
move context callback setting to ssl_init_ctx_callbacks function

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

22 years agomove server cert/key initialization to ssl_init_server_certs function
Doug MacEachern [Thu, 28 Mar 2002 02:36:05 +0000 (02:36 +0000)]
move server cert/key initialization to ssl_init_server_certs function

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

22 years agocopy DSA params to server server during key import
Doug MacEachern [Thu, 28 Mar 2002 02:28:06 +0000 (02:28 +0000)]
copy DSA params to server server during key import

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

22 years agofix logic from last commit, need to always try importing _both_ rsa
Doug MacEachern [Thu, 28 Mar 2002 02:09:58 +0000 (02:09 +0000)]
fix logic from last commit, need to always try importing _both_ rsa
and dsa

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

22 years agofold some duplication into generic ssl_server_import_key function
Doug MacEachern [Thu, 28 Mar 2002 02:01:03 +0000 (02:01 +0000)]
fold some duplication into generic ssl_server_import_key function

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

22 years agoRevert my last fix, which broke more things than it fixed
Brian Pane [Thu, 28 Mar 2002 01:57:03 +0000 (01:57 +0000)]
Revert my last fix, which broke more things than it fixed

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

22 years agofold some duplication into generic ssl_server_import_cert function
Doug MacEachern [Thu, 28 Mar 2002 01:47:50 +0000 (01:47 +0000)]
fold some duplication into generic ssl_server_import_cert function

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

22 years agomove server cert checking into generic ssl_check_public_cert function.
Doug MacEachern [Thu, 28 Mar 2002 01:32:41 +0000 (01:32 +0000)]
move server cert checking into generic ssl_check_public_cert function.

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

22 years agoDon't walk past the end of the tag in ap_ssi_get_tag_and_value()
Brian Pane [Thu, 28 Mar 2002 01:19:58 +0000 (01:19 +0000)]
Don't walk past the end of the tag in ap_ssi_get_tag_and_value()
Discovered by: Cliff Woolley

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

22 years agomove server specific init config checks into ssl_init_check_server
Doug MacEachern [Thu, 28 Mar 2002 01:14:53 +0000 (01:14 +0000)]
move server specific init config checks into ssl_init_check_server
function (ssl_init_check_proxy will be different)

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

22 years agobreak out certificate chain initialization into
Doug MacEachern [Thu, 28 Mar 2002 01:07:20 +0000 (01:07 +0000)]
break out certificate chain initialization into
ssl_init_cert_chain function

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

22 years agoap_run_sub_req does not return apr_status, so we shouldn't be checking
Bill Stoddard [Thu, 28 Mar 2002 01:05:24 +0000 (01:05 +0000)]
ap_run_sub_req does not return apr_status, so we shouldn't be checking
APR_STATUS_IS_EPIPE(). Also, remove the code that assumed the sub_req_lookup_uri
actually served up the content in the quick handler. We now call the quick_handler
in ap_run_sub_req()

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

22 years agothere is a heaping pile of:
Doug MacEachern [Thu, 28 Mar 2002 00:34:13 +0000 (00:34 +0000)]
there is a heaping pile of:
 ssl_log(s, flags, "Init: (%s) ...", sc->szVHostID)
add SSL_INIT flag to cut down some noise and end up with:
 ssl_log(s, flags, "...")

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

22 years agobreak out certificate revocation list initialization into
Doug MacEachern [Wed, 27 Mar 2002 23:53:27 +0000 (23:53 +0000)]
break out certificate revocation list initialization into
ssl_init_crl function

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

22 years agobreak out cipher suite initialization into ssl_init_cipher_suite function
Doug MacEachern [Wed, 27 Mar 2002 23:49:09 +0000 (23:49 +0000)]
break out cipher suite initialization into ssl_init_cipher_suite function

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

22 years ago"new" is a c++ keyword; s/new/mrg/g in config merge functions
Doug MacEachern [Wed, 27 Mar 2002 23:35:31 +0000 (23:35 +0000)]
"new" is a c++ keyword; s/new/mrg/g in config merge functions

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

22 years agomove warning about session cache not being configured to ssl_scache_init
Doug MacEachern [Wed, 27 Mar 2002 23:25:58 +0000 (23:25 +0000)]
move warning about session cache not being configured to ssl_scache_init

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

22 years agobreak out SSL_CTX session initialization into
Doug MacEachern [Wed, 27 Mar 2002 23:19:08 +0000 (23:19 +0000)]
break out SSL_CTX session initialization into
ssl_init_session_cache_ctx function

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

22 years agoadd entry for sslc compat layer changes
Doug MacEachern [Wed, 27 Mar 2002 22:57:47 +0000 (22:57 +0000)]
add entry for sslc compat layer changes

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

22 years agoAdd a new parameter to the quick_handler hook to instruct
Bill Stoddard [Wed, 27 Mar 2002 22:42:16 +0000 (22:42 +0000)]
Add a new parameter to the quick_handler hook to instruct
quick handlers to optionally do a lookup rather than actually
serve content. This is the first of several changes required fix
several problems with how quick handlers work with subrequests.

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

22 years agoadd license
Doug MacEachern [Wed, 27 Mar 2002 22:31:33 +0000 (22:31 +0000)]
add license

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

22 years agoSwitched to xcopy commands in the make file so that we are sure all of the
Bradley Nicholes [Wed, 27 Mar 2002 22:13:26 +0000 (22:13 +0000)]
Switched to xcopy commands in the make file so that we are sure all of the
document directories are copied during the install processing

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

22 years agoEnsure CACHE_OUT gets installed in front of SUBREQ_CORE on subrequsts.
Bill Stoddard [Wed, 27 Mar 2002 21:20:37 +0000 (21:20 +0000)]
Ensure CACHE_OUT gets installed in front of SUBREQ_CORE on subrequsts.

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

22 years ago"Oops" has two o's in it. :)
Cliff Woolley [Wed, 27 Mar 2002 21:16:37 +0000 (21:16 +0000)]
"Oops" has two o's in it.  :)

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

22 years agobreak SSL_CTX initialization into ssl_init_ctx function
Doug MacEachern [Wed, 27 Mar 2002 21:14:49 +0000 (21:14 +0000)]
break SSL_CTX initialization into ssl_init_ctx function

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

22 years ago(starting to break apart the init code into smaller, generic functions,
Doug MacEachern [Wed, 27 Mar 2002 21:07:08 +0000 (21:07 +0000)]
(starting to break apart the init code into smaller, generic functions,
preparing for proxy support)

break out verify code into ssl_init_verify function.

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

22 years agoworker MPM:
Jeff Trawick [Wed, 27 Mar 2002 20:37:32 +0000 (20:37 +0000)]
worker MPM:

get MaxRequestsPerChild to work again by allowing the main thread of
a child to be interrupted by one of the other threads in the process

this should get graceful termination to work after encountering one of
the various possible error conditions in the listener and worker threads

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

22 years agobringing back MOD_SSL_VERSION macro, define it to AP_SERVER_BASEVERSION
Doug MacEachern [Wed, 27 Mar 2002 19:38:05 +0000 (19:38 +0000)]
bringing back MOD_SSL_VERSION macro, define it to AP_SERVER_BASEVERSION

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

22 years agoadjustment for sslc where its PEM_read_bio_PrivateKey does not take a
Doug MacEachern [Wed, 27 Mar 2002 19:11:11 +0000 (19:11 +0000)]
adjustment for sslc where its PEM_read_bio_PrivateKey does not take a
callback arg.

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

22 years agoUpdate the MSVC++ project files. The debug databases were conficting between
Bill Stoddard [Wed, 27 Mar 2002 19:06:52 +0000 (19:06 +0000)]
Update the MSVC++ project files. The debug databases were conficting between
the different cache projects.

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

22 years agostatic-ize {write,read}tty variables
Doug MacEachern [Wed, 27 Mar 2002 18:46:49 +0000 (18:46 +0000)]
static-ize {write,read}tty variables

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

22 years agomove prototype for modssl_session_get_time to ssl_util_ssl.h
Doug MacEachern [Wed, 27 Mar 2002 18:20:37 +0000 (18:20 +0000)]
move prototype for modssl_session_get_time to ssl_util_ssl.h

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

22 years agoadd modssl_dh_configure() function to fold some duplication in
Doug MacEachern [Wed, 27 Mar 2002 18:19:44 +0000 (18:19 +0000)]
add modssl_dh_configure() function to fold some duplication in
get_dh{512,1024} and provide toolkit compat for sslc 2.x

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

22 years agoadd configure checks for ssl functions:
Doug MacEachern [Wed, 27 Mar 2002 17:02:56 +0000 (17:02 +0000)]
add configure checks for ssl functions:
-SSL_set_state: macro in OpenSSL, might be a function in a patched sslc
-SSL_set_cert_store: patch submitted to OpenSSL, might be applied to
OpenSSL or sslc

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

22 years agoThis might be helpful to folks readong code and reading this document to understand
Bill Stoddard [Wed, 27 Mar 2002 15:30:41 +0000 (15:30 +0000)]
This might be helpful to folks readong code and reading this document to understand
how their filter should work.

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

22 years agoDocument the APR change that bubbles up
Jim Jagielski [Wed, 27 Mar 2002 14:24:32 +0000 (14:24 +0000)]
Document the APR change that bubbles up
to affect Apache. The default ordering of the accept metux method
has been changed to match 1.3

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

22 years agostyle improvement for checking whether the result of an
Jeff Trawick [Wed, 27 Mar 2002 13:05:14 +0000 (13:05 +0000)]
style improvement for checking whether the result of an
assignment was NULL

Submitted by: Sander Striker

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

22 years agoDepreciate mod_proxy's own CHANGES file
Jim Jagielski [Wed, 27 Mar 2002 12:55:35 +0000 (12:55 +0000)]
Depreciate mod_proxy's own CHANGES file

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

22 years agofix doofo in last commit
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

22 years agosslc 1.x does not have an x509v3.h
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

22 years agosslc does not currently support X509V3_EXT_d2i
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

22 years agotoolkit compat for PEM_read_bio_PrivateKey
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

22 years agouse compat macro for another PEM_read_bio_X509
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

22 years agotoolkit compat for PEM_read_bio_X509
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

22 years agoadjust to another const char vs char mismatch between OpenSSL and sslc
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

22 years agouse SSL_SESSION_ api since SSL_SESSION cannot be dereferenced when using sslc
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

22 years agotypo fix s/EDG/EGD/g
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

22 years agomodssl_set_cipher_list was in the wrong place for OpenSSL
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

22 years agoRAND_status macro was in the wrong place
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

22 years agosslc does not currently support RAND_egd or RAND_status
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

22 years agoin sslc PEM_F_DEF_CALLBACK == PEM_F_DEF_CB
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

22 years ago2nd arg to SSL_set_cipher_list in sslc is char *
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

22 years agosslc 1.x SSL_set_verify only takes 2 args
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

22 years agosslc does not currently implement an SSL_set_state function
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

22 years agosslc adds a second, unused param to X509_verify_cert
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

22 years agosslc does not have a safestack.h, implement a minimal subset required
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

22 years agosome compat macros for sslc 1.x
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

22 years agomoving OpenSSL+sslc compat foo to ssl_toolkit_compat.h
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

22 years ago3rd arg of BIO callbacks in 'const char' in OpenSSL and 'char' in sslc,
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

22 years agoOpenSSL uses void * for callback data, sslc uses char *,
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

22 years agoadd modssl_session_get_time() function to give mod_ssl what it needs
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

22 years agoanother step towards compatiblity with rsa sslc:
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

22 years agoconfigure already checks OpenSSL version so dont bother here
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

22 years agoAnal-retentive factor -- be consistent in our whitespace.
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

22 years ago Up to .35 [no need to call out .35-dev in changes, that's just silly.]
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

22 years ago Ready for .34 evaluation.
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

22 years ago Somewhere about server/main.c rev 1.54, we lost the stop|shutdown|uninstall
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

22 years agoEnsure that the build directory is created when using VPATH.
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

22 years agoAdd text/xml, audio/mpeg, video/quicktime support to mime magic file.
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

22 years agomake it harder for spammers to harvest this email address in the future.
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

22 years agonote about the temporary DH keys
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

22 years agoa few updates
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

22 years agoper-dir SSLCACertificate{File,Path} cannot use SSL_CTX_set_cert_store
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

22 years agoFixed up the access paths for building the code generation utilities
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

22 years agoconstificationization of some char * config items
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

22 years agoperformance enhancement: mod_ssl config directives that can have both
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

22 years agocorrect comment in previous change
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

22 years agoPR:
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

22 years ago -i and -u were deprecated some time ago, they still work in 1.3, but
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

22 years ago Integrate rbb's forward port of -k config into the -h(elp), and
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

22 years agoBetter test for the presence of $(sbindir) since that is where
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

22 years agonit
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

22 years agoFix a segfault because ap_method_registry_init() was never called unless
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

22 years agoWhat, we don't support HEAD requests now? ;)
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

22 years agoSmall performance optimization for find_end_sequence(): when we find
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

22 years agoeliminate unused variables
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

22 years agoChanged mod_cgi to not do single-byte reads to consume the
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

22 years agoeliminate an unused variable
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

22 years agoEliminate an 8KB buffer from the stack in mod_info's handler function
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

22 years agoCompleted going through mod/code.xml ensuring that every directive
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

22 years agoWe have to return valid HTTP status codes from filters. This fixes two
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

22 years agofix some abuse of apr_port_t (flagged by Sun WorkShop)
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

22 years agoadd an extra level of parentheses to say "yes I know what I'm
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