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

59 Commits

Author SHA1 Message Date
William A. Rowe Jr
05fcc41a1f Update for latest structure changes for 2.0.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89644 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 20:00:50 +00:00
William A. Rowe Jr
b07a17a64f That's it. Adjust for our pcre transition, and the whole thing links
once again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89631 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 22:35:32 +00:00
William A. Rowe Jr
c0b8cc5aa8 We want the ssl_expr evaluators, now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89629 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 22:23:38 +00:00
William A. Rowe Jr
e0e8319ca1 Hope I've got these generated bits right. Note bison is more common
for Win32 then lexx.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89628 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 22:20:58 +00:00
William A. Rowe Jr
e1a4ca3ba6 Take care of folk's assert() undefined errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89627 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 22:20:09 +00:00
William A. Rowe Jr
d6bff4d622 A dash of portability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89624 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:39:26 +00:00
William A. Rowe Jr
4ba473bd88 Since mpm.h wraps unixd.h and scoreboard.h nicely, and win32 has
no unixd.h, well...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89623 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:30:37 +00:00
William A. Rowe Jr
50572ad029 Uhmm... need to NOCRYPT away WinCrypt.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89622 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:29:20 +00:00
Ralf S. Engelschall
2f9d44683b Update TODO list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89621 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:03:43 +00:00
William A. Rowe Jr
d8f39cdd57 Workaround till connection_hook details are resolved
[MATHIHALLI,MADHUSUDAN <madhusudan_mathihalli@hp.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89620 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 20:02:28 +00:00
Ralf S. Engelschall
ca8f54367f Apply mod_ssl MEGA porting patch. This is a cleaned up version of the
latest patches from Madhusudan which makes mod_ssl 95% working inside
Apache 2.0. There is still a lot of more work (both porting and cleanup)
to do be done. See modules/ssl/README for details.

Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89618 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 16:08:01 +00:00
William A. Rowe Jr
db65b5a2a2 Last of the ignore goodness for today.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89611 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 21:15:50 +00:00
William A. Rowe Jr
a9d2877e63 Fix incl/libpath to / slashes for an upcoming patch to cvtdsp.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89570 13f79535-47bb-0310-9956-ffa450edef68
2001-07-17 22:13:57 +00:00
Ralf S. Engelschall
75c03e1921 Remember current porting state
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89567 13f79535-47bb-0310-9956-ffa450edef68
2001-07-17 17:26:48 +00:00
Doug MacEachern
d7d869e327 dummy ssl hooks need to return an int value for server to function with mod_ssl compiled in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89566 13f79535-47bb-0310-9956-ffa450edef68
2001-07-17 16:36:15 +00:00
Ralf S. Engelschall
97c1ff53d7 Merge in part II of a set of mod_ssl porting changes.
Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89564 13f79535-47bb-0310-9956-ffa450edef68
2001-07-17 14:57:35 +00:00
Ralf S. Engelschall
928be41381 Merge in part of a set of mod_ssl porting changes.
Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89563 13f79535-47bb-0310-9956-ffa450edef68
2001-07-17 14:38:06 +00:00
William A. Rowe Jr
b457c188fa Win32 build changes for recent module updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89524 13f79535-47bb-0310-9956-ffa450edef68
2001-07-09 17:41:41 +00:00
William A. Rowe Jr
eb79e5a0a7 Just something for experimenting, ssl_expr_parse and _scan are excluded
for right now (missing symbols.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89462 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 01:15:31 +00:00
William A. Rowe Jr
5082a61243 Quiet the compiler, msvc is sticky about arg lists being consistent.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89461 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 01:14:04 +00:00
William A. Rowe Jr
0ac49c6424 One cannot have an entirely empty struct ... this is just to make things
actually compile, and exclude an include we don't have on Win32.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89460 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 01:13:09 +00:00
William A. Rowe Jr
16a22394c6 What once was ap_ ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89459 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 01:05:32 +00:00
Martin Kraemer
b86e18b6fe Fix typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89113 13f79535-47bb-0310-9956-ffa450edef68
2001-05-14 10:53:33 +00:00
Roy T. Fielding
ba518019b5 Eventually we will want to only find openssl once regardless of how
many modules depend on it, so make the check an autoconf macro.
Note that this still isn't being checked "the autoconf way", but it
is better than what we have now.

I'm not sure about the -R stuff, but I am told that Solaris won't
build without it.  This is something that should be tested using
AC_TRY_LINK rather than assuming openssl isn't already on the ld path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89063 13f79535-47bb-0310-9956-ffa450edef68
2001-05-10 01:47:47 +00:00
Roy T. Fielding
61084bf9ce When no specific location of openssl is given, we need to check the
places where people install upgraded software first, since otherwise
we will get the older versions installed by the OS distribution.  That's
very bad for us because we are requiring a version of openssl that is
more recent than most of the Linux distros.

When finding the openssl helper program, check both the PATH and the default
install dirs, since openssl isn't normally included on a user's path.

Use APR_ADDTO to add to the make macros in order to avoid duplicates.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89053 13f79535-47bb-0310-9956-ffa450edef68
2001-05-08 04:42:26 +00:00
Ralf S. Engelschall
f8327032bb Fix todo list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89032 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 21:04:24 +00:00
Ralf S. Engelschall
867d08ac13 Port ssl_util.c stuff to APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89031 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 21:02:22 +00:00
Ralf S. Engelschall
589126112d Port ssl_util_table.[ch] to Apache 2.0 by just removing all platform
depended code (table_read, table_write). This is possible because this
table library is local to mod_ssl and inside mod_ssl this library is
used for manipulating hash tables inside shared memory segments only. So
we can just get rid of the unportable parts at all.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89030 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 20:19:35 +00:00
Ralf S. Engelschall
95bd2224cb Port ssl_util_ssl.[ch] stuff to APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89029 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 20:11:04 +00:00
Ralf S. Engelschall
f82c32f81e Use different namespace for internal defines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89027 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 19:56:17 +00:00
Ralf S. Engelschall
8c46d8a1ab Port ssl_engine_ds.c to APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89026 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 19:53:00 +00:00
Ralf S. Engelschall
32aef20f13 Nothing to port for ssl_engine_dh.c except that
SSL_LIBRARY_VERSION has to be already available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89025 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 19:39:48 +00:00
Ralf S. Engelschall
da400e570b Remember which code parts are already ported...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89024 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 19:23:01 +00:00
Ralf S. Engelschall
3e60754671 Kick out all old mutex code and base SSLMutex on APR locks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89022 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 19:09:37 +00:00
Ralf S. Engelschall
a0f48e90fa Change mostly all old module structure hooks and EAPI hooks to
ap_hook_xxx equivalents. More work has to be done here to clean all this
up and reduce to a minimum...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89020 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 16:55:28 +00:00
Ralf S. Engelschall
11b82d3226 Axe writev(2) support from the SSL I/O layer because in Apache 2.0 we no
longer handle the bottom line of I/O ourself. Additionally this again
simplifies mod_ssl's I/O part for later transition to mod_tls's approach
with buckets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89019 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 16:47:32 +00:00
Ralf S. Engelschall
4f6be425be Axe most WIN32 stuff from Apache 1.3. In Apache 2.0 we either use APR
later for this or we don't do it at all. But we certainly no longer want
to see any platform specific things inside a module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89018 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 16:35:18 +00:00
Ralf S. Engelschall
d3cf43347b Axe out SSL_CONSERVATIVE stuff which for Apache 1.3 did I/O data
pre-sucking on POST requests and I/O re-injection in case of SSL
renegotiations. This all either cannot be solved any longer or at least
has to be implemented totally different through I/O layering/filtering.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89017 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 16:23:00 +00:00
Ralf S. Engelschall
b8998af6bd Remove one more EAPI-based thing we no longer really need.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89016 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 16:02:33 +00:00
Ralf S. Engelschall
507c1de06c remove remaining references to compat and sdbm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89015 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 15:32:46 +00:00
Ralf S. Engelschall
3d89ecb040 compat and local sdbm stuff is already gone
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89014 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 15:31:36 +00:00
Ralf S. Engelschall
f3281a2f0f Axe out SSL_USE_SDBM stuff, i.e., get rid of the local SDBM copy and use
APR's DBM API instead. The remaining question just is whether APR's DBM
allows "larger" things like SSL sessions to be stored...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89013 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 15:26:06 +00:00
Ralf S. Engelschall
6eab92084b Axe out the complete SSL_COMPAT stuff. Because Apache 2.0 is already
incompatible at many places to Apache 1.3 we also don't want this stuff
anymore. Apache 2.0's mod_ssl will be mostly compatibile with Apache
1.3's mod_ssl, of course. But we really no longer want to be compatible
to Sioux and other obsolete SSL things...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89012 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 15:10:58 +00:00
Ralf S. Engelschall
a561739b98 Start writing down incompatibilities to mod_ssl 2.x from Apache 1.3.
Our general goal is to axe down mod_ssl to a minimum, because what we
don't have anymore we don't have to port and as simpler mod_ssl becomes.
Nevertheless we will try to minimize incompatibilities if possible.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89011 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 15:06:35 +00:00
Ralf S. Engelschall
4a4ce878a4 Axe out EAPI-based SSL_VENDOR stuff.
If we want this later again, we have to do it differently anyway. So,
for now we try to strip down mod_ssl as heavy as possible and hence we
kick out this stuff at all.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89010 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 15:02:13 +00:00
Ralf S. Engelschall
f922bfa218 Finalize the build environment by integrating the last thing (the
lex/yacc stuff) into Makefile.in and getting rid of the old Apache 1.3
Makefile.tmpl file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89009 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 13:21:54 +00:00
Ralf S. Engelschall
f176ba44b1 Next step in mod_ssl integration:
Add missing files to build environment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89006 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 10:12:08 +00:00
Ralf S. Engelschall
fa3c8387ec Activate the command_rec structure.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89005 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 09:58:04 +00:00
Ralf S. Engelschall
cd9d4cc641 Update file description list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89004 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 09:31:25 +00:00
Ralf S. Engelschall
abe8ac0cfe Get rid of libssl.modules and libssl.version. libssl.version we
no longer need, because mod_ssl no longer has its own version.
libssl.modules is now more or less (except for the old custom Apache 1.3
configuration rules) replaced by the Autoconf based config.m4.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89003 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 09:30:21 +00:00