dgaudet     98/09/22 09:47:32

  Log:
  import apache-1.3.3-dev sources as of 19980922
  
  Status:
  
  Vendor Tag:   APACHE
  Release Tags: APACHE_1_3_19980922
  
  U apache-2.0/apache-nspr/.cvsignore
  U apache-2.0/apache-nspr/.gdbinit
  U apache-2.0/apache-nspr/Apache.dsp
  U apache-2.0/apache-nspr/Apache.mak
  U apache-2.0/apache-nspr/ApacheCore.def
  U apache-2.0/apache-nspr/ApacheCore.dsp
  U apache-2.0/apache-nspr/ApacheCore.mak
  N apache-2.0/apache-nspr/BUILD.NOTES
  U apache-2.0/apache-nspr/CHANGES
  C apache-2.0/apache-nspr/Configuration.tmpl
  U apache-2.0/apache-nspr/Configure
  U apache-2.0/apache-nspr/INDENT
  U apache-2.0/apache-nspr/INSTALL
  U apache-2.0/apache-nspr/Makefile.nt
  C apache-2.0/apache-nspr/Makefile.tmpl
  U apache-2.0/apache-nspr/PORTING
  U apache-2.0/apache-nspr/README
  U apache-2.0/apache-nspr/README.EBCDIC
  U apache-2.0/apache-nspr/buildmark.c
  U apache-2.0/apache-nspr/ap/.cvsignore
  U apache-2.0/apache-nspr/ap/.indent.pro
  C apache-2.0/apache-nspr/ap/Makefile.tmpl
  C apache-2.0/apache-nspr/ap/ap.dsp
  C apache-2.0/apache-nspr/ap/ap.mak
  U apache-2.0/apache-nspr/ap/ap_cpystrn.c
  U apache-2.0/apache-nspr/ap/ap_execve.c
  N apache-2.0/apache-nspr/ap/ap_fnmatch.c
  U apache-2.0/apache-nspr/ap/ap_signal.c
  U apache-2.0/apache-nspr/ap/ap_slack.c
  C apache-2.0/apache-nspr/ap/ap_snprintf.c
  U apache-2.0/apache-nspr/main/.cvsignore
  U apache-2.0/apache-nspr/main/.indent.pro
  C apache-2.0/apache-nspr/main/Makefile.tmpl
  C apache-2.0/apache-nspr/main/alloc.c
  C apache-2.0/apache-nspr/main/buff.c
  U apache-2.0/apache-nspr/main/gen_test_char.c
  U apache-2.0/apache-nspr/main/gen_test_char.dsp
  U apache-2.0/apache-nspr/main/gen_test_char.mak
  U apache-2.0/apache-nspr/main/gen_uri_delims.c
  U apache-2.0/apache-nspr/main/gen_uri_delims.dsp
  U apache-2.0/apache-nspr/main/gen_uri_delims.mak
  C apache-2.0/apache-nspr/main/http_config.c
  C apache-2.0/apache-nspr/main/http_core.c
  C apache-2.0/apache-nspr/main/http_log.c
  C apache-2.0/apache-nspr/main/http_main.c
  C apache-2.0/apache-nspr/main/http_protocol.c
  C apache-2.0/apache-nspr/main/http_request.c
  U apache-2.0/apache-nspr/main/http_vhost.c
  U apache-2.0/apache-nspr/main/md5c.c
  C apache-2.0/apache-nspr/main/rfc1413.c
  C apache-2.0/apache-nspr/main/util.c
  C apache-2.0/apache-nspr/main/util_date.c
  C apache-2.0/apache-nspr/main/util_md5.c
  C apache-2.0/apache-nspr/main/util_script.c
  U apache-2.0/apache-nspr/main/util_uri.c
  N apache-2.0/apache-nspr/helpers/MakeEtags
  U apache-2.0/apache-nspr/helpers/CutRule
  U apache-2.0/apache-nspr/helpers/GuessOS
  U apache-2.0/apache-nspr/helpers/MakeLint
  U apache-2.0/apache-nspr/helpers/PrintPath
  U apache-2.0/apache-nspr/helpers/TestCompile
  N apache-2.0/apache-nspr/helpers/buildinfo.sh
  N apache-2.0/apache-nspr/helpers/checkheader.sh
  U apache-2.0/apache-nspr/helpers/dummy.c
  U apache-2.0/apache-nspr/helpers/find-dbm-lib
  N apache-2.0/apache-nspr/helpers/findcpp.sh
  U apache-2.0/apache-nspr/helpers/fmn.sh
  U apache-2.0/apache-nspr/helpers/fp2rp
  U apache-2.0/apache-nspr/helpers/install.sh
  U apache-2.0/apache-nspr/helpers/mfhead
  U apache-2.0/apache-nspr/helpers/mkdir.sh
  U apache-2.0/apache-nspr/helpers/mkshadow.sh
  U apache-2.0/apache-nspr/helpers/ppl.sh
  N apache-2.0/apache-nspr/helpers/slo.sh
  U apache-2.0/apache-nspr/include/.cvsignore
  U apache-2.0/apache-nspr/include/.indent.pro
  C apache-2.0/apache-nspr/include/alloc.h
  C apache-2.0/apache-nspr/include/ap.h
  N apache-2.0/apache-nspr/include/ap_compat.h
  N apache-2.0/apache-nspr/include/ap_config.h
  N apache-2.0/apache-nspr/include/ap_ctype.h
  U apache-2.0/apache-nspr/include/ap_md5.h
  N apache-2.0/apache-nspr/include/ap_mmn.h
  C apache-2.0/apache-nspr/include/buff.h
  U apache-2.0/apache-nspr/include/compat.h
  C apache-2.0/apache-nspr/include/conf.h
  U apache-2.0/apache-nspr/include/explain.h
  U apache-2.0/apache-nspr/include/fnmatch.h
  C apache-2.0/apache-nspr/include/hsregex.h
  C apache-2.0/apache-nspr/include/http_conf_globals.h
  U apache-2.0/apache-nspr/include/http_config.h
  U apache-2.0/apache-nspr/include/http_core.h
  C apache-2.0/apache-nspr/include/http_log.h
  U apache-2.0/apache-nspr/include/http_main.h
  C apache-2.0/apache-nspr/include/http_protocol.h
  C apache-2.0/apache-nspr/include/http_request.h
  U apache-2.0/apache-nspr/include/http_vhost.h
  C apache-2.0/apache-nspr/include/httpd.h
  U apache-2.0/apache-nspr/include/multithread.h
  U apache-2.0/apache-nspr/include/rfc1413.h
  C apache-2.0/apache-nspr/include/scoreboard.h
  U apache-2.0/apache-nspr/include/util_date.h
  C apache-2.0/apache-nspr/include/util_md5.h
  C apache-2.0/apache-nspr/include/util_script.h
  U apache-2.0/apache-nspr/include/util_uri.h
  U apache-2.0/apache-nspr/modules/.cvsignore
  U apache-2.0/apache-nspr/modules/README
  U apache-2.0/apache-nspr/modules/example/.cvsignore
  U apache-2.0/apache-nspr/modules/example/.indent.pro
  U apache-2.0/apache-nspr/modules/example/Makefile.tmpl
  U apache-2.0/apache-nspr/modules/example/README
  C apache-2.0/apache-nspr/modules/example/mod_example.c
  U apache-2.0/apache-nspr/modules/experimental/.cvsignore
  U apache-2.0/apache-nspr/modules/experimental/.indent.pro
  U apache-2.0/apache-nspr/modules/experimental/Makefile.tmpl
  C apache-2.0/apache-nspr/modules/experimental/mod_mmap_static.c
  U apache-2.0/apache-nspr/modules/proxy/.cvsignore
  U apache-2.0/apache-nspr/modules/proxy/.indent.pro
  U apache-2.0/apache-nspr/modules/proxy/ApacheModuleProxy.dsp
  U apache-2.0/apache-nspr/modules/proxy/ApacheModuleProxy.mak
  U apache-2.0/apache-nspr/modules/proxy/Makefile.libdir
  C apache-2.0/apache-nspr/modules/proxy/Makefile.tmpl
  U apache-2.0/apache-nspr/modules/proxy/mod_proxy.c
  U apache-2.0/apache-nspr/modules/proxy/mod_proxy.h
  C apache-2.0/apache-nspr/modules/proxy/proxy_cache.c
  C apache-2.0/apache-nspr/modules/proxy/proxy_connect.c
  C apache-2.0/apache-nspr/modules/proxy/proxy_ftp.c
  C apache-2.0/apache-nspr/modules/proxy/proxy_http.c
  U apache-2.0/apache-nspr/modules/proxy/proxy_util.c
  U apache-2.0/apache-nspr/modules/standard/.cvsignore
  U apache-2.0/apache-nspr/modules/standard/.indent.pro
  C apache-2.0/apache-nspr/modules/standard/Makefile.tmpl
  C apache-2.0/apache-nspr/modules/standard/mod_access.c
  C apache-2.0/apache-nspr/modules/standard/mod_actions.c
  U apache-2.0/apache-nspr/modules/standard/mod_alias.c
  C apache-2.0/apache-nspr/modules/standard/mod_asis.c
  C apache-2.0/apache-nspr/modules/standard/mod_auth.c
  U apache-2.0/apache-nspr/modules/standard/mod_auth_anon.c
  U apache-2.0/apache-nspr/modules/standard/mod_auth_db.c
  U apache-2.0/apache-nspr/modules/standard/mod_auth_db.module
  U apache-2.0/apache-nspr/modules/standard/mod_auth_dbm.c
  C apache-2.0/apache-nspr/modules/standard/mod_autoindex.c
  C apache-2.0/apache-nspr/modules/standard/mod_cern_meta.c
  C apache-2.0/apache-nspr/modules/standard/mod_cgi.c
  C apache-2.0/apache-nspr/modules/standard/mod_digest.c
  C apache-2.0/apache-nspr/modules/standard/mod_dir.c
  U apache-2.0/apache-nspr/modules/standard/mod_env.c
  C apache-2.0/apache-nspr/modules/standard/mod_expires.c
  U apache-2.0/apache-nspr/modules/standard/mod_headers.c
  C apache-2.0/apache-nspr/modules/standard/mod_imap.c
  C apache-2.0/apache-nspr/modules/standard/mod_include.c
  C apache-2.0/apache-nspr/modules/standard/mod_info.c
  U apache-2.0/apache-nspr/modules/standard/mod_log_agent.c
  C apache-2.0/apache-nspr/modules/standard/mod_log_config.c
  U apache-2.0/apache-nspr/modules/standard/mod_log_referer.c
  C apache-2.0/apache-nspr/modules/standard/mod_mime.c
  C apache-2.0/apache-nspr/modules/standard/mod_mime_magic.c
  C apache-2.0/apache-nspr/modules/standard/mod_negotiation.c
  C apache-2.0/apache-nspr/modules/standard/mod_rewrite.c
  C apache-2.0/apache-nspr/modules/standard/mod_rewrite.h
  U apache-2.0/apache-nspr/modules/standard/mod_setenvif.c
  C apache-2.0/apache-nspr/modules/standard/mod_so.c
  C apache-2.0/apache-nspr/modules/standard/mod_speling.c
  C apache-2.0/apache-nspr/modules/standard/mod_status.c
  U apache-2.0/apache-nspr/modules/standard/mod_unique_id.c
  C apache-2.0/apache-nspr/modules/standard/mod_userdir.c
  U apache-2.0/apache-nspr/modules/standard/mod_usertrack.c
  U apache-2.0/apache-nspr/modules/test/.cvsignore
  U apache-2.0/apache-nspr/modules/test/.indent.pro
  U apache-2.0/apache-nspr/modules/test/Makefile.tmpl
  U apache-2.0/apache-nspr/modules/test/README
  U apache-2.0/apache-nspr/modules/test/mod_rndchunk.c
  U apache-2.0/apache-nspr/modules/test/mod_test_util_uri.c
  U apache-2.0/apache-nspr/os/.indent.pro
  U apache-2.0/apache-nspr/os/bs2000/.cvsignore
  U apache-2.0/apache-nspr/os/bs2000/Makefile.tmpl
  U apache-2.0/apache-nspr/os/bs2000/bs2login.c
  U apache-2.0/apache-nspr/os/bs2000/ebcdic.c
  U apache-2.0/apache-nspr/os/bs2000/ebcdic.h
  U apache-2.0/apache-nspr/os/bs2000/os-inline.c
  U apache-2.0/apache-nspr/os/bs2000/os.c
  U apache-2.0/apache-nspr/os/bs2000/os.h
  N apache-2.0/apache-nspr/os/os2/.cvsignore
  N apache-2.0/apache-nspr/os/os2/Makefile.tmpl
  N apache-2.0/apache-nspr/os/os2/os-inline.c
  N apache-2.0/apache-nspr/os/os2/os.c
  N apache-2.0/apache-nspr/os/os2/os.h
  N apache-2.0/apache-nspr/os/os2/util_os2.c
  U apache-2.0/apache-nspr/os/unix/.cvsignore
  U apache-2.0/apache-nspr/os/unix/Makefile.tmpl
  U apache-2.0/apache-nspr/os/unix/os-aix-dso.c
  U apache-2.0/apache-nspr/os/unix/os-inline.c
  C apache-2.0/apache-nspr/os/unix/os.c
  U apache-2.0/apache-nspr/os/unix/os.h
  U apache-2.0/apache-nspr/os/win32/.cvsignore
  U apache-2.0/apache-nspr/os/win32/ApacheModuleAuthAnon.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleAuthAnon.mak
  U apache-2.0/apache-nspr/os/win32/ApacheModuleCERNMeta.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleCERNMeta.mak
  U apache-2.0/apache-nspr/os/win32/ApacheModuleDigest.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleDigest.mak
  U apache-2.0/apache-nspr/os/win32/ApacheModuleExpires.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleExpires.mak
  U apache-2.0/apache-nspr/os/win32/ApacheModuleHeaders.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleHeaders.mak
  U apache-2.0/apache-nspr/os/win32/ApacheModuleInfo.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleInfo.mak
  U apache-2.0/apache-nspr/os/win32/ApacheModuleRewrite.dsp
  U apache-2.0/apache-nspr/os/win32/ApacheOS.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleRewrite.mak
  U apache-2.0/apache-nspr/os/win32/ApacheModuleSpeling.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleSpeling.mak
  U apache-2.0/apache-nspr/os/win32/ApacheModuleStatus.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleStatus.mak
  U apache-2.0/apache-nspr/os/win32/ApacheModuleUserTrack.dsp
  C apache-2.0/apache-nspr/os/win32/ApacheModuleUserTrack.mak
  U apache-2.0/apache-nspr/os/win32/ApacheOS.mak
  U apache-2.0/apache-nspr/os/win32/MakeModuleMak.cpp
  U apache-2.0/apache-nspr/os/win32/MakeModuleMak.mak
  C apache-2.0/apache-nspr/os/win32/Module.mak.tmpl
  U apache-2.0/apache-nspr/os/win32/getopt.c
  U apache-2.0/apache-nspr/os/win32/getopt.h
  U apache-2.0/apache-nspr/os/win32/main_win32.c
  U apache-2.0/apache-nspr/os/win32/mod_dll.c
  C apache-2.0/apache-nspr/os/win32/mod_isapi.c
  C apache-2.0/apache-nspr/os/win32/modules.c
  C apache-2.0/apache-nspr/os/win32/multithread.c
  U apache-2.0/apache-nspr/os/win32/os.c
  C apache-2.0/apache-nspr/os/win32/os.h
  U apache-2.0/apache-nspr/os/win32/passwd.c
  U apache-2.0/apache-nspr/os/win32/passwd.h
  U apache-2.0/apache-nspr/os/win32/readdir.c
  U apache-2.0/apache-nspr/os/win32/readdir.h
  C apache-2.0/apache-nspr/os/win32/registry.c
  U apache-2.0/apache-nspr/os/win32/registry.h
  U apache-2.0/apache-nspr/os/win32/service.c
  U apache-2.0/apache-nspr/os/win32/service.h
  C apache-2.0/apache-nspr/os/win32/util_win32.c
  U apache-2.0/apache-nspr/regex/.cvsignore
  U apache-2.0/apache-nspr/regex/COPYRIGHT
  U apache-2.0/apache-nspr/regex/Makefile.tmpl
  U apache-2.0/apache-nspr/regex/README
  U apache-2.0/apache-nspr/regex/WHATSNEW
  U apache-2.0/apache-nspr/regex/cclass.h
  U apache-2.0/apache-nspr/regex/cname.h
  U apache-2.0/apache-nspr/regex/debug.c
  U apache-2.0/apache-nspr/regex/engine.c
  U apache-2.0/apache-nspr/regex/engine.ih
  U apache-2.0/apache-nspr/regex/main.c
  U apache-2.0/apache-nspr/regex/mkh
  U apache-2.0/apache-nspr/regex/regcomp.c
  U apache-2.0/apache-nspr/regex/regcomp.ih
  U apache-2.0/apache-nspr/regex/regerror.c
  U apache-2.0/apache-nspr/regex/regerror.ih
  U apache-2.0/apache-nspr/regex/regex.3
  U apache-2.0/apache-nspr/regex/regex.7
  U apache-2.0/apache-nspr/regex/regex.dsp
  U apache-2.0/apache-nspr/regex/regex.mak
  U apache-2.0/apache-nspr/regex/regex2.h
  U apache-2.0/apache-nspr/regex/regexec.c
  U apache-2.0/apache-nspr/regex/regfree.c
  U apache-2.0/apache-nspr/regex/split.c
  U apache-2.0/apache-nspr/regex/tests
  U apache-2.0/apache-nspr/regex/utils.h
  U apache-2.0/apache-nspr/support/.cvsignore
  U apache-2.0/apache-nspr/support/.indent.pro
  U apache-2.0/apache-nspr/support/Makefile.tmpl
  U apache-2.0/apache-nspr/support/ab.1
  U apache-2.0/apache-nspr/support/ab.c
  U apache-2.0/apache-nspr/support/apachectl
  U apache-2.0/apache-nspr/support/apachectl.1
  U apache-2.0/apache-nspr/support/apxs.8
  U apache-2.0/apache-nspr/support/apxs.pl
  U apache-2.0/apache-nspr/support/dbmmanage
  U apache-2.0/apache-nspr/support/dbmmanage.1
  U apache-2.0/apache-nspr/support/htdigest.1
  U apache-2.0/apache-nspr/support/htdigest.c
  U apache-2.0/apache-nspr/support/htpasswd.1
  U apache-2.0/apache-nspr/support/htpasswd.c
  U apache-2.0/apache-nspr/support/httpd.8
  U apache-2.0/apache-nspr/support/httpd.exp
  U apache-2.0/apache-nspr/support/log_server_status
  U apache-2.0/apache-nspr/support/logresolve.8
  U apache-2.0/apache-nspr/support/logresolve.c
  U apache-2.0/apache-nspr/support/logresolve.pl
  U apache-2.0/apache-nspr/support/phf_abuse_log.cgi
  U apache-2.0/apache-nspr/support/rotatelogs.8
  U apache-2.0/apache-nspr/support/rotatelogs.c
  U apache-2.0/apache-nspr/support/split-logfile
  U apache-2.0/apache-nspr/support/suexec.8
  U apache-2.0/apache-nspr/support/suexec.c
  U apache-2.0/apache-nspr/support/suexec.h
  U apache-2.0/apache-nspr/test/.cvsignore
  U apache-2.0/apache-nspr/test/.indent.pro
  U apache-2.0/apache-nspr/test/README
  U apache-2.0/apache-nspr/test/check_chunked
  U apache-2.0/apache-nspr/test/cls.c
  U apache-2.0/apache-nspr/test/tcpdumpscii.txt
  U apache-2.0/apache-nspr/test/test-writev.c
  U apache-2.0/apache-nspr/test/test_date.c
  N apache-2.0/apache-nspr/test/test_limits.c
  U apache-2.0/apache-nspr/test/test_select.c
  U apache-2.0/apache-nspr/test/time-sem.c
  U apache-2.0/apache-nspr/test/zb.c
  U apache-2.0/apache-nspr/test/rename/Makefile
  U apache-2.0/apache-nspr/test/rename/README
  U apache-2.0/apache-nspr/test/rename/apapi.h
  U apache-2.0/apache-nspr/test/rename/apapi.h.mk
  U apache-2.0/apache-nspr/test/rename/apapi_compat.h
  U apache-2.0/apache-nspr/test/rename/apapi_compat.h.mk
  U apache-2.0/apache-nspr/test/rename/compat.h
  U apache-2.0/apache-nspr/test/rename/compat.h.mk
  U apache-2.0/apache-nspr/test/rename/rename.cf
  U apache-2.0/apache-nspr/test/rename/rename.cf.clean-api
  U apache-2.0/apache-nspr/test/rename/rename.cf.update
  U apache-2.0/apache-nspr/test/rename/rename.pl
  U apache-2.0/apache-nspr/test/vhtest/README
  U apache-2.0/apache-nspr/test/vhtest/runtest
  U apache-2.0/apache-nspr/test/vhtest/bin/test1
  U apache-2.0/apache-nspr/test/vhtest/bin/test1d
  U apache-2.0/apache-nspr/test/vhtest/bin/test2
  U apache-2.0/apache-nspr/test/vhtest/bin/test2d
  U apache-2.0/apache-nspr/test/vhtest/bin/test3
  U apache-2.0/apache-nspr/test/vhtest/bin/test4
  U apache-2.0/apache-nspr/test/vhtest/bin/test5
  U apache-2.0/apache-nspr/test/vhtest/bin/test6
  U apache-2.0/apache-nspr/test/vhtest/bin/vhget
  U apache-2.0/apache-nspr/test/vhtest/conf/common.conf
  U apache-2.0/apache-nspr/test/vhtest/conf/mime.types
  U apache-2.0/apache-nspr/test/vhtest/conf/test1.conf
  U apache-2.0/apache-nspr/test/vhtest/conf/test1d.conf
  U apache-2.0/apache-nspr/test/vhtest/conf/test2.conf
  U apache-2.0/apache-nspr/test/vhtest/conf/test2d.conf
  U apache-2.0/apache-nspr/test/vhtest/conf/test3.conf
  U apache-2.0/apache-nspr/test/vhtest/conf/test4.conf
  U apache-2.0/apache-nspr/test/vhtest/conf/test5.conf
  U apache-2.0/apache-nspr/test/vhtest/conf/test6.conf
  U apache-2.0/apache-nspr/test/vhtest/docroot/default1/vhost.txt
  U apache-2.0/apache-nspr/test/vhtest/docroot/default2/vhost.txt
  U apache-2.0/apache-nspr/test/vhtest/docroot/default3/vhost.txt
  U apache-2.0/apache-nspr/test/vhtest/docroot/main/vhost.txt
  U apache-2.0/apache-nspr/test/vhtest/docroot/vhost1/vhost.txt
  U apache-2.0/apache-nspr/test/vhtest/docroot/vhost2/vhost.txt
  U apache-2.0/apache-nspr/test/vhtest/docroot/vhost3/vhost.txt
  U apache-2.0/apache-nspr/test/vhtest/docroot/vhost4/vhost.txt
  U apache-2.0/apache-nspr/test/vhtest/docroot/vhost5/vhost.txt
  
  82 conflicts created by this import.
  Use the following command to help the merge:
  
        cvs checkout -jAPACHE:yesterday -jAPACHE apache-2.0/apache-nspr

Reply via email to