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

2792 Commits

Author SHA1 Message Date
Bill Stoddard
8ef1d7f01e Fix check for APR feature
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93996 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 15:45:46 +00:00
Cliff Woolley
55d4960f3a Get mod_mem_cache to compile cleanly again on linux, where apr_atomic_t
is a struct.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93995 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 06:37:32 +00:00
Cliff Woolley
1e54774af1 Hacks on top of hacks... UNIX needs unistd.h for the close() prototype
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93993 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 05:22:37 +00:00
Cliff Woolley
5a52f372e4 Fix a possibly-uninitialized warning and a boolean logic bug
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93992 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 03:19:30 +00:00
Cliff Woolley
bebc477f50 Fix some possibly-uninitialized warnings and some incorrect format strings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93991 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 03:18:47 +00:00
Bill Stoddard
9443a2ac8e Fix some formatting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93985 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 22:20:50 +00:00
Brian Pane
c6f154af33 Performance fix for ap_ssi_get_tag_and_value: do a lightweight
scan through the tag value until/unless we reach a backslash
that necessitates the more complicated scanner loop.  In cases
where there isn't a backslash in the tag value, this reduces
the overhead of the scan from 5 comparisons per character to 3.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93983 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 17:35:39 +00:00
William A. Rowe Jr
05ae021cfd Clear up a const warning, and recognize some arrays by changing the
variable names to the plural [rather than aszFoo, which I hope continues
  to be cleaned up as folks have time.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93982 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 17:32:24 +00:00
William A. Rowe Jr
9738c5be8e Fix a signedness emit based on session_id_length [unsigned]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93981 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 17:31:34 +00:00
Brian Pane
908c6dec75 Another optimization for find_end_sequence: once we're in the
middle of parsing a tag, consume the entire tag in a quick loop,
rather than jumping back to the outer state-machine loop for
each character


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93979 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 06:31:22 +00:00
Brian Pane
f70f782273 Small performance improvement for find_end_sequence()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93978 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 06:04:33 +00:00
Jeff Trawick
f4a27d9935 fix a compile error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93976 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 01:36:30 +00:00
Jeff Trawick
0bd9790c41 fix the type of a string argument to ap_log_error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93973 13f79535-47bb-0310-9956-ffa450edef68
2002-03-16 20:29:38 +00:00
William A. Rowe Jr
189e3aa081 PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93971 13f79535-47bb-0310-9956-ffa450edef68
2002-03-16 19:34:33 +00:00
William A. Rowe Jr
d07e31f81f Simplify s/APR_OS_PROC_T_FMT/APR_PID_T_FMT/, apr_os_foo entities aren't
for external consumption.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93969 13f79535-47bb-0310-9956-ffa450edef68
2002-03-16 18:42:46 +00:00
William A. Rowe Jr
65a37752ec Eliminate potential ap_server_root_relative segfaults, with the input
of Jeff Trawick's style changes to the first patches.  Doesn't include
  the fixes to ssl [more complex], and we won't trap errors that involve
  ap_serverroot, since we presume that was normalized on the way in.
  Therefore, testing ap_server_root_relative(DEFAULT_FOO) cases
  should never become necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93965 13f79535-47bb-0310-9956-ffa450edef68
2002-03-16 18:26:58 +00:00
William A. Rowe Jr
8bc668d002 Silly module, we don't need compat.h :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93964 13f79535-47bb-0310-9956-ffa450edef68
2002-03-16 17:55:07 +00:00
Jeff Trawick
d7c6f23395 make sure we set rc before referencing it
use a somewhat better warning message for a failure of
ap_server_relative_root()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93962 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 20:43:03 +00:00
William A. Rowe Jr
feaf0b8072 Another potential ap_server_root_relative failure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93959 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 16:59:51 +00:00
William A. Rowe Jr
06429468f2 Style touchup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93958 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 16:58:27 +00:00
William A. Rowe Jr
07a0a459f4 Another potential ap_server_root_relative failure.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93957 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 16:57:08 +00:00
William A. Rowe Jr
2e8d8b0bdd A coworker discovered that really bogus path names segfault the server
on Win32.  ap_server_root_relative() doesn't have an apr_status_t result,
  so we are limited in what we can figure out - but 99.99% of the time,
  the file's path is just plain bogus.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93956 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 15:31:17 +00:00
Jeff Trawick
5ae24550fc speed up the short_report path... we were unnecessarily
walking the scoreboard

Submitted by:	Stas Bekman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93955 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 15:30:22 +00:00
Jeff Trawick
8a5b90c365 Factor out a bunch of commonality between the HAVE_TIMES path and
the !HAVE_TIMES path.  This will help avoid future errors similar
to the ones fixed earlier today.

The code change also has the benefit of getting the paren-matching
feature of some editors to work properly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93954 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 15:16:27 +00:00
Jeff Trawick
d403a74533 fix a couple of formatting bugs in the !HAVE_TIMES path
(somebody forgot to convert floating point format to
long integer format when APR-izing the time)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93951 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 12:40:39 +00:00
Jeff Trawick
f3084243f2 make mod_status a little faster by checking for an active server sooner in
the main loop

clean up the main loop by continuing when the server isn't active instead
of introducing yet another level of nesting


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93950 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 12:04:58 +00:00
Doug MacEachern
1cd38a962c get rid of some -Wall warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93947 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 01:46:47 +00:00
Doug MacEachern
6363a96546 remove stray log message (from madhu)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93946 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 01:44:14 +00:00
Doug MacEachern
97b148c3b5 PR:
Obtained from:
Submitted by:   Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:	dougm
implement SSLSessionCache shmht and shmcb based on apr_rmm and apr_shm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93942 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 23:31:23 +00:00
Jeff Trawick
2df1a02f72 deal with the rename of kill_after_timeout to APR_KILL_AFTER_TIMEOUT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93940 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 22:19:14 +00:00
Bradley Nicholes
5fe463a540 Import file for NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93938 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 21:10:22 +00:00
Bradley Nicholes
4fccbc6459 Switched to the new winsock header for NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93935 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 16:48:58 +00:00
Doug MacEachern
9813433685 fix comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93932 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 07:21:10 +00:00
Doug MacEachern
e00ddfd24b PR:
Obtained from:
Submitted by:
Reviewed by:
fix bug in ssl_io_input_getline():
in most cases we get all the headers on the first SSL_read.
however, in certain cases SSL_read will only get a partial
chunk of the headers, so we now try to read until LF is seen.

bug seen with netscape client (running both on linux and win32) and
server running on win32.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93931 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 07:04:10 +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
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
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
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