www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Code Activity
8,172 Commits 62 Branches 306 Tags
94de8923dba848c60553c4f3cd594f45875cc428
Commit Graph

2792 Commits

Author SHA1 Message Date
Doug MacEachern
20ed127171 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
 2002-03-27 03:31:23 +00:00
Doug MacEachern
49e69c7029 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
 2002-03-27 03:28:52 +00:00
Doug MacEachern
008b963af9 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
 2002-03-27 03:27:13 +00:00
Doug MacEachern
fecf892d82 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
 2002-03-27 03:13:32 +00:00
Doug MacEachern
e6392769aa 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
 2002-03-27 03:11:22 +00:00
Doug MacEachern
66419ef565 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
 2002-03-27 03:09:11 +00:00
Doug MacEachern
642262e204 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
 2002-03-27 03:04:24 +00:00
Doug MacEachern
7f4a6ff760 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
 2002-03-27 03:02:10 +00:00
Doug MacEachern
11cf72871b 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
 2002-03-27 02:53:38 +00:00
Doug MacEachern
2eefae08bd 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
 2002-03-27 02:50:43 +00:00
Doug MacEachern
1d2a39531c 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
 2002-03-27 02:28:15 +00:00
Doug MacEachern
5bfe936911 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
 2002-03-27 01:58:15 +00:00
Doug MacEachern
22c5fe3f27 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
 2002-03-27 01:50:43 +00:00
Doug MacEachern
ebe92b6f8b 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
 2002-03-27 01:28:20 +00:00
Doug MacEachern
0fb13a8b4a 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
 2002-03-27 00:46:07 +00:00
Doug MacEachern
d37bf62cd7 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
 2002-03-27 00:32:07 +00:00
Cliff Woolley
7a5af0ba71 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
 2002-03-27 00:28:07 +00:00
Doug MacEachern
1c430e2df7 note about the temporary DH keys 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94181 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-26 17:29:36 +00:00
Doug MacEachern
6edf8d0380 a few updates 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94180 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-26 17:17:27 +00:00
Doug MacEachern
7c1521f253 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
 2002-03-26 16:57:49 +00:00
Doug MacEachern
9303382216 constificationization of some char * config items 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94177 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-26 15:49:37 +00:00
Doug MacEachern
6fba41424d 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
 2002-03-26 15:42:21 +00:00
Doug MacEachern
dd679accdf correct comment in previous change 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94171 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-26 00:49:37 +00:00
Doug MacEachern
dc0b193480 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
 2002-03-26 00:30:47 +00:00
Cliff Woolley
a31e5cc460 nit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94157 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-25 07:37:34 +00:00
Cliff Woolley
388bb6d20f 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
 2002-03-25 07:20:45 +00:00
Cliff Woolley
0cdeea46f3 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
 2002-03-25 01:10:06 +00:00
Brian Pane
f75049a4b1 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
 2002-03-24 06:42:14 +00:00
Jeff Trawick
2030234ca7 eliminate unused variables 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94152 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-24 02:55:35 +00:00
Brian Pane
804f94d21f 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
 2002-03-23 23:19:41 +00:00
Jeff Trawick
161365781c eliminate an unused variable 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94146 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-23 13:06:30 +00:00
Brian Pane
0adefd4831 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
 2002-03-23 06:03:37 +00:00
Jeff Trawick
eab06b27db 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
 2002-03-22 21:41:14 +00:00
Jeff Trawick
ee4a64c90a 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
 2002-03-22 20:37:04 +00:00
Graham Leggett
9cb9ca8e3a 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
 2002-03-22 18:34:46 +00:00
Jeff Trawick
00afbe274a 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
 2002-03-22 11:45:26 +00:00
William A. Rowe Jr
e8dd037868 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
 2002-03-22 06:51:52 +00:00
William A. Rowe Jr
3105b7eaa1 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
 2002-03-22 06:09:39 +00:00
Jeff Trawick
e410111205 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
 2002-03-22 02:56:56 +00:00
Bill Stoddard
8315a9d245 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
 2002-03-22 02:48:00 +00:00
Jeff Trawick
3400f03621 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
 2002-03-22 00:59:23 +00:00
Graham Leggett
19c0213612 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
 2002-03-21 12:05:45 +00:00
Sander Striker
b2bb3f6764 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
 2002-03-21 10:10:41 +00:00
William A. Rowe Jr
5f469e7815 Now-meaningless-commentary. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94071 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-21 05:28:48 +00:00
Bill Stoddard
d5c24720dc 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
 2002-03-20 17:41:55 +00:00
Jeff Trawick
5f8b426d1d Get nph- CGI scripts working again by avoiding filters that can't 
possibly deal with a script that generates the protocol header.

PR:       8902, 8907, 9983


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94052 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-20 13:57:08 +00:00
Jeff Trawick
f3c3ebe7f5 ap_rset_content_type() should take const char * instead of char * 
this is friendlier to callers and r->content_type is const char *
too so it isn't harmful

this fixes a fatal compile error with AIX+xlc


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94051 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-20 12:03:49 +00:00
Bill Stoddard
470edb9dd8 First commit to introduce accessor function to set r->content_type.. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94027 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-20 01:58:47 +00:00
Greg Stein
b9514876c3 The underlying change here was to add the new WebDAV/DeltaV methods 
now that it has an RFC. At the same time, I revamped a good chunk of
the name <-> number mapping code in http_protocol.c

* add M_FOO constants for the new RFC 3253 (DeltaV) methods. label
  where each of the builtin methods comes from.

* moved METHOD_NUMBER_FIRST/LAST from http_protocol.h into
  http_protocol.c since they weren't used anywhere else and they
  weren't namespace-protected.

* create register_one_method() and use it to insert all builtin
  methods (at _init() time) and extended methods into the registry.

* add a lookup_builtin_method() to quickly map a method name to a
  builtin method number.

* rebuild ap_method_number_of() to use the new lookup function.

* revamp ap_method_name_of() to use the registry to locate the name
  for any method number. add a pool argument (no callers in the core
  code needed to be updated)

* revamp make_allow() to deal with the new method numbers and all
  extended methods.

* in mod_dav, use the new method numbers rather than registering the
  DeltaV methods.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94015 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-19 10:11:33 +00:00
Greg Stein
f39844f2e6 Change the REPORT handling APIs to deliver the content directly into 
the filter stack, rather than buffering everything into memory(!).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94003 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-18 22:25:01 +00:00