CVS: cvs.openbsd.org: src

[Henning Brauer <henning_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org>]

CVSROOT:	/cvs
Module name:	src
Changes by:	henning_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	2003/11/17 11:57:06

Modified files:
	usr.sbin/httpd : Announcement INSTALL 
	usr.sbin/httpd/conf: httpd.conf-dist mime.types 
	usr.sbin/httpd/htdocs/manual: cygwin.html install-tpf.html 
	                              install.html.en install.html.html 
	                              install.html.ja.jis 
	                              windows.html.en 
	                              windows.html.ja.jis 
	usr.sbin/httpd/htdocs/manual/howto: ssi.html.ja.jis 
	usr.sbin/httpd/htdocs/manual/misc: API.html FAQ.html 
	usr.sbin/httpd/htdocs/manual/mod: core.html.en core.html.html 
	                                  directives.html.ja.jis 
	                                  mod_access.html.en 
	                                  mod_access.html.html 
	                                  mod_proxy.html 
	usr.sbin/httpd/src: CHANGES CHANGES.SSL Configure 
	usr.sbin/httpd/src/include: httpd.h 
	usr.sbin/httpd/src/main: alloc.c buff.c http_core.c http_main.c 
	                         http_request.c rfc1413.c 
	usr.sbin/httpd/src/modules/proxy: proxy_ftp.c 
	usr.sbin/httpd/src/modules/ssl: Makefile.tmpl Makefile.win32 
	                                libssl.module libssl.version 
	                                mod_ssl.c mod_ssl.h 
	                                ssl_engine_compat.c 
	                                ssl_engine_config.c 
	                                ssl_engine_dh.c ssl_engine_ds.c 
	                                ssl_engine_ext.c 
	                                ssl_engine_init.c 
	                                ssl_engine_io.c 
	                                ssl_engine_kernel.c 
	                                ssl_engine_log.c 
	                                ssl_engine_mutex.c 
	                                ssl_engine_pphrase.c 
	                                ssl_engine_rand.c 
	                                ssl_engine_vars.c ssl_expr.c 
	                                ssl_expr.h ssl_expr_eval.c 
	                                ssl_expr_parse.y ssl_expr_scan.l 
	                                ssl_scache.c ssl_scache_dbm.c 
	                                ssl_scache_shmcb.c 
	                                ssl_scache_shmht.c ssl_util.c 
	                                ssl_util_sdbm.c ssl_util_sdbm.h 
	                                ssl_util_ssl.c ssl_util_ssl.h 
	                                ssl_util_table.c 
	                                ssl_util_table.h 
	usr.sbin/httpd/src/modules/standard: mod_include.c mod_mime.c 
	                                     mod_usertrack.c 
	usr.sbin/httpd/src/support: ab.c dbmmanage suexec.c 

Log message:
merge apache 1.3.29 and mod_ssl 2.8.16
ok brad@