]>
granicus.if.org Git - apache/log
Bill Stoddard [Wed, 3 Apr 2002 17:34:01 +0000 (17:34 +0000)]
Make comments and function name agree with what the functions actually do.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94421
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 3 Apr 2002 15:47:59 +0000 (15:47 +0000)]
worker MPM:
Don't create a listener thread until we have a worker thread. Otherwise,
in situations where we'll have to wait a while to take over scoreboard
slots from a previous generation, we'll be accepting connections we can't
process yet.
Don't let the listener thread clobber the scoreboard entry of the first
worker thread.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94420
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 3 Apr 2002 13:45:57 +0000 (13:45 +0000)]
prefork MPM: add -DFOREGROUND option to use when you want
the parent process to run in the foreground
(NO_DETACH is a special mode for running under
programs like daemontools)
the existing flag -DDEBUG turns on FOREGROUND
now instead of NO_DETACH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94419
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 3 Apr 2002 13:38:06 +0000 (13:38 +0000)]
style change only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94418
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 3 Apr 2002 13:10:56 +0000 (13:10 +0000)]
Allow worker MPM to build on systems without pthread_kill().
Submitted by: Pier Fumagalli (and mangled by Jeff)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94417
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 3 Apr 2002 06:16:24 +0000 (06:16 +0000)]
Elimiate references of subreferences to simplify rebuild logic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94415
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 3 Apr 2002 06:09:18 +0000 (06:09 +0000)]
Much easier to clone first than fix later - next batch of builds this
poorly thought out will simply be vetoed - do you really expect M$'s
defaults to make any sense? And what's with /I "C:\foo" ???
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94414
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 3 Apr 2002 06:07:36 +0000 (06:07 +0000)]
Would really prefer if the authors of the .dsp's would maintain this...
better yet - clone existing .dsp's to assure they are correct
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94413
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 3 Apr 2002 05:53:33 +0000 (05:53 +0000)]
Can't we -please- rename mod_file_cache if it doesn't fit in the
mod_cache scheme of things?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94412
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 3 Apr 2002 05:52:08 +0000 (05:52 +0000)]
Gheesh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94411
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 3 Apr 2002 05:29:35 +0000 (05:29 +0000)]
On second thought ... I can see some weird sign bit magic messing this
up on some hypothetical CPU... better to cast the net expression.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94410
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 3 Apr 2002 05:28:04 +0000 (05:28 +0000)]
A very safe cast for any ^2 based cpu. Are we expecting any trinary CPUs
any time soon for Apache support? Cleans up an emit on 32 bit builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94409
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 3 Apr 2002 04:07:35 +0000 (04:07 +0000)]
First meager steps to documenting mod_cache
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94408
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 22:07:09 +0000 (22:07 +0000)]
fix SSL_X509_INFO_load_path so SSLProxyMachineCertificatePath works
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94406
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 21:57:31 +0000 (21:57 +0000)]
copy-n-pasto: need to use SSL_X509_INFO_load_*path* on pkp->cert_path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94405
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 21:56:12 +0000 (21:56 +0000)]
copy-n-pasto: ssl_cmd_SSLProxyMachineCertificatePath needs to set cert_path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94404
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 21:32:35 +0000 (21:32 +0000)]
fix copy-n-pasto: ssl_cmd_SSLProxyCACertificatePath needs to use
ssl_cmd_check_dir rather than ssl_cmd_check_file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94403
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 20:53:17 +0000 (20:53 +0000)]
another todo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94400
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Tue, 2 Apr 2002 20:40:48 +0000 (20:40 +0000)]
Update the transformations.
Sorry for the huge diff. It seems that switching from Xalan-j to xalan-c
causes the attributes to get reordered.
Suggestions for improvements to the build system would be greatly
appreciated.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94399
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Tue, 2 Apr 2002 20:39:16 +0000 (20:39 +0000)]
Just a little change so that this will validate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94398
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 17:30:08 +0000 (17:30 +0000)]
PR:
Obtained from:
Submitted by:
Reviewed by: Ryan Bloom
ap_remove_output_filter no longer works for connection filters.
change logic in the case of "HTTP spoken on HTTPS port" to disable the
ssl filters rather than attempt to remove the filters.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94393
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 17:23:41 +0000 (17:23 +0000)]
various updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94392
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Tue, 2 Apr 2002 16:25:23 +0000 (16:25 +0000)]
Check for a NULL pointer in the case of the OS address space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94388
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 2 Apr 2002 14:48:54 +0000 (14:48 +0000)]
Win32: tweak some messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94387
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 2 Apr 2002 14:42:06 +0000 (14:42 +0000)]
Win32: Change startup/shutdown message class to NOTICE. These messages should always
be written to the error log regardless of the loglevel.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94386
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Striker [Tue, 2 Apr 2002 11:55:19 +0000 (11:55 +0000)]
Add myself on this bright and sunny day.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94385
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 04:30:49 +0000 (04:30 +0000)]
PR:
Obtained from:
Submitted by:
Reviewed by: Ryan Bloom
remove call to ap_proxy_reset_output_filters() and the function itself.
this call breaks ssl proxy when the client is using keepalives.
this function is also no longer needed with recent-ish filter changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94383
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 2 Apr 2002 04:15:55 +0000 (04:15 +0000)]
Note about ap_cache_msec2hex() and ap_cache_hex2msec() to keep me from forgetting
to fix it...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94382
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 2 Apr 2002 04:14:04 +0000 (04:14 +0000)]
Win32: Add mod_cache, mod_mem_cache and mod_disk_cache to the build and
install.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94381
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 2 Apr 2002 04:04:17 +0000 (04:04 +0000)]
Use runtime library linking. This reduces the size of the *.so files substantially
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94377
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 2 Apr 2002 03:54:38 +0000 (03:54 +0000)]
Cleanup some compile warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94376
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 2 Apr 2002 03:09:53 +0000 (03:09 +0000)]
A few additional examples added to the docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94373
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Tue, 2 Apr 2002 02:38:31 +0000 (02:38 +0000)]
Grammar police. (Well, you asked for it. ;) There's still a split
infinitive in the last sentence, but I don't really believe in that
rule, so...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94372
13f79535 -47bb-0310-9956-
ffa450edef68
Aaron Bannert [Tue, 2 Apr 2002 01:07:43 +0000 (01:07 +0000)]
Update the docs on the ScoreBoardFile directive for the new
apr_shm.h API and the removal of the old SCOREBOARD_FILE stuff.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94370
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Tue, 2 Apr 2002 00:29:23 +0000 (00:29 +0000)]
Replaced a hack for getting the address space with the real API
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94369
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Mon, 1 Apr 2002 22:26:09 +0000 (22:26 +0000)]
Prevent ap_add_output_filters_by_type from being called in
ap_set_content_type if the content-type hasn't changed.
Reviewed by: Ryan Bloom
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94368
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Mon, 1 Apr 2002 22:06:49 +0000 (22:06 +0000)]
Fix some of the cache size checks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94367
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Mon, 1 Apr 2002 21:19:41 +0000 (21:19 +0000)]
And it only took me what, 10 months? :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94366
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Mon, 1 Apr 2002 18:55:46 +0000 (18:55 +0000)]
Win32: Move apr_bucket_alloc() to a more reasonable location to fix memory leak.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94362
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Mon, 1 Apr 2002 17:13:19 +0000 (17:13 +0000)]
Remove some gratuitous comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94361
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Mon, 1 Apr 2002 16:42:02 +0000 (16:42 +0000)]
Destroy the connection pool (and therefore run the cleanups) before destroying
the bucket_alloc as the cleanups refer to buckets allocated by the
bucket_alloc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94360
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Mon, 1 Apr 2002 16:09:46 +0000 (16:09 +0000)]
If this is a subrequest, register the cleanup against
the main request. This will prevent the cache object
from being cleaned up from under the request after the
subrequest is destroyed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94359
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 1 Apr 2002 12:53:09 +0000 (12:53 +0000)]
Don't allow initialization to succeed if we can't get a socket
corresponding to one of the Listen statements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94358
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 1 Apr 2002 08:27:42 +0000 (08:27 +0000)]
Migrate perchild to the new lock API, and clean up some of the logic
surrounding the FD passing. This doesn't work yet, but it is getting
closer. Currently, the problem is that we don't correctly read the data
from the socket so that it can be passed to the correct child.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94357
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Mon, 1 Apr 2002 05:43:47 +0000 (05:43 +0000)]
Match the new APR_BUCKET_BUFF_SIZE. We want this to be slightly less than
8KB to leave room for the various allocators' internal structures while
still fitting into a total of 8KB.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94356
13f79535 -47bb-0310-9956-
ffa450edef68
Dirk-Willem van Gulik [Mon, 1 Apr 2002 04:32:40 +0000 (04:32 +0000)]
Made AB's use of the Host: header rfc2616 compliant as
reported by Taisuke Yamada <tai@iij.ad.jp>
PR:
Obtained from: Mailing list
Submitted by: Taisuke Yamada <tai@iij.ad.jp>
Reviewed by: Dirk-Willem van Gulik
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94355
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 1 Apr 2002 03:41:31 +0000 (03:41 +0000)]
A bunch of Perchild changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94353
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 1 Apr 2002 03:37:21 +0000 (03:37 +0000)]
Make perchild work with the new bucket_allocation API. Also, allow
the Perchild directives to take both numerical UID/GID and the
logical user name/group name.
PR: 9784
Submitted by: named UID/GID logic: Scott Lamb <slamb@slamb.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94352
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 1 Apr 2002 02:41:08 +0000 (02:41 +0000)]
pointer subtraction yeilds a ssize_t, fix emit by notating the
expression in terms of addition
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94351
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 1 Apr 2002 02:39:31 +0000 (02:39 +0000)]
Fix another linkage error for 2.0.34 and cvs head
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94350
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 1 Apr 2002 00:32:39 +0000 (00:32 +0000)]
Get the Perchild MPM to compile and serve pages again. There are a lot
of bugs left in this, but I am taking things one step at a time. This
will work again. This also gets perchild using the correct variable for
MaxRequestsPerChild
PR: 9856, 9855, 9052
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94349
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 31 Mar 2002 17:32:23 +0000 (17:32 +0000)]
it is sunny and warm in tahoe, still plenty of snow on the mountains
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94348
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 31 Mar 2002 12:42:51 +0000 (12:42 +0000)]
Roll these changes into 2.0.34
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94347
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Havard [Sun, 31 Mar 2002 07:48:56 +0000 (07:48 +0000)]
Handle CR/LF terminated lines from CGI scripts.
Reviewed by: Brian Pane
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94346
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Sat, 30 Mar 2002 23:55:16 +0000 (23:55 +0000)]
Removed the single-byte header reads from mod_cgid
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94344
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Sat, 30 Mar 2002 23:11:55 +0000 (23:11 +0000)]
Fixed script error logging, which I'd left commented out after making
the changes to use a brigade to read the script headers
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94343
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Sat, 30 Mar 2002 22:48:39 +0000 (22:48 +0000)]
Fix for a bug that I introduced when eliminating the single-byte
reads in mod_cgi: eof wasn't treated as an error condition when
reading the script headers, so we were delivering a 200 when a
CGI script produced no output.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94342
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 08:11:44 +0000 (08:11 +0000)]
add/use EVP_PKEY_reference_inc and X509_reference_inc compat macros
to get these changes working with sslc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94341
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 07:42:30 +0000 (07:42 +0000)]
add sslc compat for sk_X509_INFO_free
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94340
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 06:46:24 +0000 (06:46 +0000)]
add SSLProxyCARevocation{File,Path} directives to support CRLs in the proxy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94338
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 06:38:10 +0000 (06:38 +0000)]
pass sc to myCtxConfig macro
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94337
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 06:36:56 +0000 (06:36 +0000)]
make it possible for proxy to use CRL callback
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94336
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 06:20:16 +0000 (06:20 +0000)]
enable the verify callback for proxy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94334
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 06:19:14 +0000 (06:19 +0000)]
ap_proxy_http_request needs to check the return status of ap_pass_brigade
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94333
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 06:03:08 +0000 (06:03 +0000)]
change sc->server references to myCtxConfig, so proxy can use the
verify callback.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94332
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 05:57:59 +0000 (05:57 +0000)]
add myCtxConfig macro
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94331
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 05:40:02 +0000 (05:40 +0000)]
implement proxy client certificate callback
(uses SSLProxyMachineCertificate{File,Cert} when downstream server
requires a client certificate)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94329
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 05:16:55 +0000 (05:16 +0000)]
input filter should not return failure when ssl runtime wants to read more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94328
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 04:52:48 +0000 (04:52 +0000)]
ssl_io_input_read needs to return something other than APR_SUCCESS
when bucket read from socket was successful,
but there was an error within the ssl runtime.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94327
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 01:50:10 +0000 (01:50 +0000)]
load SSLProxyMachineCertificate{File,Path}
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94324
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 01:41:35 +0000 (01:41 +0000)]
enable/cleanup SSL_X509_INFO_load_{file,path} functions for use in
proxy context
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94323
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Sat, 30 Mar 2002 00:00:21 +0000 (00:00 +0000)]
Fix the version string. We want to end up with "mod_ssl/2.0.xx", not
"mod_ssl/Apache/2.0.xx".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94320
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Fri, 29 Mar 2002 19:22:47 +0000 (19:22 +0000)]
Cloudy today.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94317
13f79535 -47bb-0310-9956-
ffa450edef68
Dirk-Willem van Gulik [Fri, 29 Mar 2002 19:20:40 +0000 (19:20 +0000)]
Removed email address on request - as obviscation was slammed down on the list - and Google is your friend in any case
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94315
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 17:56:33 +0000 (17:56 +0000)]
add SSLProxyEngine directive. this was not required in the 1.x based
mod_ssl because the SSL_CTX was created and configured for *every*
request. unlike in 2.0 where we configure the proxy SSL_CTX at
startup time, which is much better for performance. but we don't want
to configure a proxy context for every vhost if it isn't going to be
used, for the same reasons we don't create a server context for every
vhost unless SSLEngine is on.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94314
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 17:48:28 +0000 (17:48 +0000)]
check the return value of ap_proxy_ssl_enable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94313
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 29 Mar 2002 16:21:48 +0000 (16:21 +0000)]
Syncing makes no sense now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94309
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Fri, 29 Mar 2002 16:15:33 +0000 (16:15 +0000)]
PR:
Obtained from:
Submitted by: Paul J. Reder
Reviewed by:
Remove the MPM_SYNC_CHILD_TABLE macro since there is no longer a scoreboard
file that needs to be synched.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94308
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 29 Mar 2002 14:33:50 +0000 (14:33 +0000)]
The old, legacy (and unused) code in which the scoreboard was totally
and completely contained in a file (SCOREBOARD_FILE) has been
removed. This does not affect scoreboards which are *mapped* to
files using named-shared-memory at all. This implies that scoreboards
must be based, at some level, on native shared memory (mmap, shm_open,
shmget, whatever), but the code has assumed that for quite awhile
now. Having the scoreboard be *based* on a file makes no sense today.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94306
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Fri, 29 Mar 2002 08:17:26 +0000 (08:17 +0000)]
BUCKET FREELISTS
Add an allocator-passing mechanism throughout the bucket brigades API.
From Apache's standpoint, the apr_bucket_alloc_t* used throughout a given
connection is stored in the conn_rec by the create_connection hook. That
means it's the MPM's job to optimize recycling of apr_bucket_alloc_t's --
the MPM must ensure that no two threads can ever use the same one at the
same time, for instance.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94304
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 08:04:04 +0000 (08:04 +0000)]
import ssl_proxy_enable in the post config phase, otherwise LoadModule
order may leave us without the function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94303
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 07:37:28 +0000 (07:37 +0000)]
remove ssl_engine_ext.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94302
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 07:36:01 +0000 (07:36 +0000)]
removing old proxy extension code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94301
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 07:29:11 +0000 (07:29 +0000)]
hook into mod_ssl for https support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94300
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 07:23:09 +0000 (07:23 +0000)]
need to flush output buffer before reading in proxy mode
need to call ssl_hook_process_connection in the output filter in proxy
mode, since proxy hits the output filter before the input filter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94299
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 07:22:43 +0000 (07:22 +0000)]
in proxy mode we need to SSL_connect rather than SSL_accept in
ssl_hook_process_connection.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94298
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Fri, 29 Mar 2002 07:12:01 +0000 (07:12 +0000)]
These two variables were left uninitialized accidentally.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94297
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Fri, 29 Mar 2002 06:26:03 +0000 (06:26 +0000)]
Document the variable expansion enhancements for mod_include
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94295
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Fri, 29 Mar 2002 05:58:39 +0000 (05:58 +0000)]
Allow variable expansion within in the "var" arg to <!--#echo
and <!--#set, so that people can do things like this:
<!--#echo var="${foo}_${bar}" -->
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94294
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 04:50:37 +0000 (04:50 +0000)]
add optional function (ssl_proxy_enable) to turn on ssl proxy
choose SSL_CTX based on SSLConnRec.is_proxy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94293
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 04:48:01 +0000 (04:48 +0000)]
init proxy context
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94292
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Fri, 29 Mar 2002 04:47:10 +0000 (04:47 +0000)]
Replaced my fix for the is_only_below() bug with Cliff's faster
and simpler version.
Submitted by: Cliff Woolley
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94291
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 03:19:12 +0000 (03:19 +0000)]
s/id/mode/ in ssl_cmd_SSLProxyVerify
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94290
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 03:05:49 +0000 (03:05 +0000)]
use ssl_cmd_verify_parse for SSLProxyVerify directive handler
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94289
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:59:27 +0000 (02:59 +0000)]
cleanup the proxy context
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94288
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:48:20 +0000 (02:48 +0000)]
s/ctx/dcfg/g in ssl directive handlers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94287
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:43:33 +0000 (02:43 +0000)]
enable proxy directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94286
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:20:58 +0000 (02:20 +0000)]
change existing ssl_init_ctx() to ssl_init_ctx_protocol()
new ssl_init_ctx() inits the lot: protocol, session_cache, callbacks,
verify, cipher suite, crl, cert_chain
new ssl_init_server_ctx function inits everything for sc->server
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94285
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Fri, 29 Mar 2002 02:14:45 +0000 (02:14 +0000)]
Fixes for three problems in mod_include:
* The ctx->tag_length computation in find_end_sequence() was a bit
broken in cases where there was a "false alarm" match on a partial
"-->"
* The ap_ssi_get_tag_and_value() function needs to avoid walking off
the end of the string. After debugging this some more, I ended up
using Cliff's original patch.
* Infinite loop in is_only_below()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94284
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:09:59 +0000 (02:09 +0000)]
proxy will have a different verify callback
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94283
13f79535 -47bb-0310-9956-
ffa450edef68