1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

7861 Commits

Author SHA1 Message Date
William A. Rowe Jr
f2e2cdcdb8 My [sixth?] major revamp of service.c. Traded an event for a mutex
to the service_init completion, expanded timeouts, moved SERVICE_STOPPED
  message posting to the main thread since sometimes, in odd cirumstances,
  our SCM thread wasn't resumed prior to termination, and ripped the code
  for the stderr logs to use nt_eventlog.c instead.  And generally tried
  to make the code just a little bit more grokable [as if such a thing
  is really possible.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93928 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 04:34:03 +00:00
William A. Rowe Jr
3dab10782e Cleanup the eventlogger code, and split it into its own source.
[got the copyright correct, no less.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93927 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 04:19:00 +00:00
William A. Rowe Jr
6d0a9307b3 Now that we test ownership of the listeners in listen.c, -k "start"
can no longer hang on to the listeners after it checks that they are
  free.  Also, we cannot be checking listeners if we are using -k "config"
  to alter the service config, since the service might be running as we
  try this, and we cannot check the listeners in -k "restart", since we
  are pretty certain they are owned by the running service we are about
  to try restarting..


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93926 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 04:12:12 +00:00
William A. Rowe Jr
fa3ba046f1 The be-certain-we-own-the-socket patch to listen.c fails if we hang
on to the originals after duplicating sockets.  If you dup, you aught
  to be closing the source.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93925 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 04:08:51 +00:00
William A. Rowe Jr
92cf62dc0d Our ap_listeners were binding to IIS sockets, other Apache instances'
listeners, the bottoms of peoples' shoes, etc.

  Wait to set SO_REUSEADDR on Win32 until the parent is certain the
  port is all ours.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93924 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 04:06:02 +00:00
Jeff Trawick
3a2b57187a Fix apxs -g handling.
Move config_vars.mk from the top build directory to the build directory.
Get build/rules.mk cleaned up for distclean/extraclean.

PR:     10163
        (This is the 2nd of two commits for that PR.  The first was to
        apxs.in -- rev 1.35.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93923 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 03:16:50 +00:00
Bill Stoddard
2d9939a923 Fix win32 compile breakage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93922 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 22:34:46 +00:00
Joshua Slive
971767fd80 Fix a couple typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93921 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 21:52:35 +00:00
Bill Stoddard
0a62271096 Decline urls ending with /
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93920 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 21:47:03 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Jeff Trawick
52e9962a8e fix the remaining sizeof(token.value) bogosity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93917 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:41:48 +00:00
Jeff Trawick
0d850d0b4c Fix some mod_include bugs which broke the evaluation of some expressions.
There are a few instances of the same basic problem which are not yet
fixed and which I have marked with /* XXX.*FUBAR*/.

PR:      10108


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93916 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:32:28 +00:00
Bill Stoddard
6752a95e45 Move the quick_handler comment to the new quick handler location. Do not
call quick handler on a dirent subrequest. This fixes a nasty problem in
mod_cache where it was serving up content on a dirent subrequest.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93915 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 19:41:56 +00:00
Jeff Trawick
ff76c93622 simplify the way we find the family of an apr_sockaddr_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93914 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 19:07:04 +00:00
Doug MacEachern
e89fcb92f1 use ssl_asn1_keystr
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93913 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 18:59:56 +00:00
Doug MacEachern
07965e685f add ssl_asn1_keystr() util function that returns string representation
(RSA or DSA) of the key index.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93912 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 18:56:07 +00:00
Doug MacEachern
9432ed4273 use ssl_asn1_table_keyfmt() function and only format each (rsa,dsa)
lookup key once, rather than twice.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93911 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 18:51:35 +00:00
Doug MacEachern
98786b66c7 use ssl_asn1_table_keyfmt() function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93910 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 18:50:17 +00:00
Doug MacEachern
cc09059d11 add ssl_asn1_table_keyfmt() function for clarity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93909 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 18:42:05 +00:00
Jeff Trawick
78dd935a31 get some hardcoded paths out of apxs
PR:          10163 (but PR isn't completely solved with this commit)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93908 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 18:02:02 +00:00
Doug MacEachern
0b5ac66e05 PR:
Obtained from:
Submitted by:   Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:	dougm
adjust to SSL_SESSION_id2sz() prototype change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93907 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 17:09:51 +00:00
Doug MacEachern
7d097d17ad generalize session logging into ssl_session_log() function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93906 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 17:02:45 +00:00
Bill Stoddard
ca79431488 Remove incomplete cache_objects from the cache if the cache update fails. This
fixes a bug where the cache was referencing freed cache_objects.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93903 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 13:56:20 +00:00
Jeff Trawick
ea0096097b zap some crufty NO_GETTIMEOFDAY code
Submitted by:       Stas Bekman
Reviewed by:        Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93902 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 13:08:49 +00:00
Jeff Trawick
5baa83e59f fix the calculation of request time in mod_status
(currently nobody sets the start/stop times so this fix isn't
immediately apparent)

Submitted by:    Stas Bekman
Reviewed by:     Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93901 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 12:40:59 +00:00
Jeff Trawick
d86a35b7e5 Fix the calculation of thread_num in the worker score structure.
Submitted by:   Stas Bekman
Reviewed by:    Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93900 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 12:25:31 +00:00
Doug MacEachern
ed35c47220 SSL_SESSION_id2sz() was NOT THREAD SAFE. it returned a pointer to a
static variable.  fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93899 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 06:41:46 +00:00
Doug MacEachern
ccaced8c5d SSL_SESSION_id2sz() is somewhat expensive, make sure we only call it
if SSLLogLevel >= info


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93898 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 06:12:24 +00:00
Doug MacEachern
5de4869446 cleanup logging of CRL, includes ridding of some malloc/frees
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93897 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 05:30:43 +00:00
Doug MacEachern
9dbc0c3442 couple o minor style/log fixos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93896 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 05:05:51 +00:00
Doug MacEachern
55294115e5 use ptemp in ssl_init_FindCAList() rather than creating a subpool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93895 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 04:59:19 +00:00
Doug MacEachern
e38e20775e switch to ptemp pool for ssl_pphrase_Handle
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93894 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 04:49:23 +00:00
Doug MacEachern
22b44bf05c only call: ssl_rand_seed(s, p, SSL_RSCTX_STARTUP, "Init: ");
once at startup.  if there is value in calling it more than once at
startup, it should be done explicitly rather than hidden in
ssl_tmp_keys_init().

switch to ptemp pool when calling ssl_rand_seed() at startup.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93893 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 04:38:35 +00:00
Doug MacEachern
ab91c2a588 remove ssl_engine_ds.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93892 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 04:16:11 +00:00
Doug MacEachern
cc61103ca6 remove obsolete ssl_ds_{table,array} api
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93891 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 04:14:43 +00:00
Doug MacEachern
3b380d5848 replace ssl_ds_array usage with apr_array_header_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93890 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 03:59:43 +00:00
Bill Stoddard
3b5e58ba6e Enable mod_mem_cache to use apr_atomic operators in managing cache_object
reference counting. Enabled by default via the USE_ATOMICS preproc directive.
This compiles cleanly and serves pages on Windows. Not compiled or tested on
any other OS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93889 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 03:59:21 +00:00
Bill Stoddard
ee42c383b1 A bit more cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93888 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 03:00:22 +00:00
Doug MacEachern
ec39586ace minor ssl_init_CheckServers() enhancements:
- pass the ptemp (temporary pool) so we don't need to create a subpool
  and destroy it ourselves.

- change ssl_ds_table usage to apr_hash_t


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93887 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 01:15:14 +00:00
Doug MacEachern
e7f00d8c09 folding more duplication in ssl_tmp_keys_init
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93886 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 00:50:13 +00:00
Doug MacEachern
63e70cd522 cleanup tmp key callbacks. each had assigned the same (1024 bit) value
in 3 different places.  the old code did nothing special in the case
of the export flag either.

add an ssl_log in each to trace when keys are being handed out.

add some XXX comments.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93885 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 23:42:53 +00:00
Jeff Trawick
53d837b39b simplify the way we find the family of an apr_sockaddr_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93884 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 23:15:54 +00:00
Doug MacEachern
d9d26c6b82 for the sake of readablity,
change: SSL_TKPIDX_{DH,RSA}{512,1024}
to:     SSL_TMP_KEY_{DH,RSA}_{512,1024}


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93883 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 23:05:33 +00:00
Doug MacEachern
52ff7b736e split ssl_init_TmpKeysHandle function to init/free functions,
and make them static to ssl_engine_init.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93882 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 22:50:38 +00:00
Doug MacEachern
15d581b6fe it is not required that temporary keys survive restarts, since they
are generated and destroyed on every restart.

so get rid of SSLModConfigRec.tTmpKeys table and mess that was
managing it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93881 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 22:34:31 +00:00
Bill Stoddard
1eddc44767 cleanup some code paths
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93880 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 22:26:07 +00:00
Doug MacEachern
bed8256dc1 remove version checks for using EGD
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93879 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 22:11:51 +00:00
Doug MacEachern
e77f92b4e5 remove call to legacy X509V3_add_standard_extensions() function,
not needed with OpenSSL 0.9.6+


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93878 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 22:08:23 +00:00
Doug MacEachern
47c4501000 we require OpenSSL 0.9.6+
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93877 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 22:07:12 +00:00
Bill Stoddard
fcc65d9d3b Remove some deprecated comments. Delete some unused variables.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93876 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 22:05:21 +00:00