diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2002-07-15 10:14:08 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2002-07-15 10:14:08 +0000 |
| commit | ee62a7eef069e63a993121d1b457a5e030d2c62f (patch) | |
| tree | 5d49e20c8e1a452fa36f866cfc21b1cebe6b5d60 /usr.sbin | |
| parent | 516694478397620f56e85d6b3840c2150757f1e1 (diff) | |
nuke more leftovers from pre-1.3.24
Diffstat (limited to 'usr.sbin')
71 files changed, 0 insertions, 14921 deletions
diff --git a/usr.sbin/httpd/src/os/win32/installer/README.TXT b/usr.sbin/httpd/src/os/win32/installer/README.TXT deleted file mode 100644 index 247cdd1fe32..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/README.TXT +++ /dev/null @@ -1,6 +0,0 @@ -Read the Apache for Windows how to release document at - - http://dev.apache.org/how-to-release-win32.html - -for details of how to use this IS2 configuration file and -the installer DLL to build an Apache release. diff --git a/usr.sbin/httpd/src/os/win32/installer/apache.iwz b/usr.sbin/httpd/src/os/win32/installer/apache.iwz deleted file mode 100644 index 6af3320c83f..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/apache.iwz +++ /dev/null @@ -1,995 +0,0 @@ - -[InstallShield Wizard] -iDate=1 -iTime=1 -Flag=fe000000 -ISX.EXE Size=630784 -ISX.EXE Date=10:43:52 24/2/1998 -ISX.EXE Ver=2.0.0.143 -SETUP.EXE Size=45312 -SETUP.EXE Date=9:53:32 18/1/1997 -SETUP.EXE Ver=3.0.111.0 -SETUP.INS Size=70160 -SETUP.INS Date=13:16:56 11/2/1998 -SETUP.INS Ver=Not available -_INST16.EX_ Size=282766 -_INST16.EX_ Date=9:56:04 18/1/1997 -_INST16.EX_ Ver=Not available -_INST32I.EX_ Size=320411 -_INST32I.EX_ Date=10:04:08 18/1/1997 -_INST32I.EX_ Ver=Not available -ISDEPEND.INI Size=320411 -ISDEPEND.INI Date=10:04:08 18/1/1997 -ISDEPEND.INI Ver=Not available -SWDEPEND.INI Size=320411 -SWDEPEND.INI Date=10:04:08 18/1/1997 -SWDEPEND.INI Ver=Not available -ICOMP.EXE Size=119808 -ICOMP.EXE Date=14:05:10 15/1/1996 -ICOMP.EXE Ver=3.00.062 -SPLIT.EXE Size=90624 -SPLIT.EXE Date=14:09:36 15/1/1996 -SPLIT.EXE Ver=3.00.060 -PACKLIST.EXE Size=87552 -PACKLIST.EXE Date=14:10:30 15/1/1996 -PACKLIST.EXE Ver=3.00.060 -Version=2.02 -DevTool=Generic Windows -Platform=Win32 -DisksDir=apache\650MB\ -TabsVisit=1111001110000111100011 -LangNum=451 -LangDir=LANG\ENG\ - -[VisualDesign] -AppName=Apache -AppExe= -AppExeFile= -Version=1.3.7 dev -Company=Apache Group -Title=Apache Web Server 1.3.7 dev -TitleType=1 -BackgrndBmp= -BackgrndAlign=4 -Backgrnd=1 -BackgrndColor=10 -Uninstall=1 -Silent=1 -SmsMode=0 - -[Types] -Types=3 -Type1Components=6 -Type1Name=Custom -Type1ComponentList=1 3 4 6 5 2 -Type2Components=5 -Type2Name=Typical -Type2ComponentList=1 3 4 6 5 -Type3Components=2 -Type3Name=Compact -Type3ComponentList=1 6 - -[Components] -Components=6 -Component1Groups=6 -Component1Name=Application Files -Component1Description=Application files needed to run the application -Component1GroupList=1 3 24 25 4 35 -Component2Groups=17 -Component2Name=Source Code -Component2Description=Source code for Apache and support tools -Component2GroupList=10 11 12 13 14 15 16 17 18 19 20 21 22 23 31 32 34 -Component3Groups=6 -Component3Name=Apache Manual -Component3Description=Apache documentation -Component3GroupList=5 6 7 8 9 36 -Component4Groups=1 -Component4Name=Additional Modules -Component4Description=Apache modules to extend the server -Component4GroupList=2 -Component5Groups=2 -Component5Name=Icons -Component5Description=Icons for directory indexes -Component5GroupList=27 33 -Component6Groups=4 -Component6Name=Required Directories -Component6Description= -Component6GroupList=26 28 29 30 - -[Groups] -Groups=36 -Group1Size=346325 -Group1Files=9 -Group1Name=Program Executables -Group1Dir=<INSTALLDIR> -Group1Update=0 -Group1TargetOS=-1 -Group1File1=C:\Apache\Apache.exe -Group1File2=C:\Apache\ApacheCore.dll -Group1File3=C:\Apache\Announcement -Group1File4=C:\Apache\ABOUT_APACHE -Group1File5=C:\Apache\KEYS -Group1File6=C:\Apache\LICENSE -Group1File7=C:\Apache\README -Group1File8=C:\apache\Makefile.tmpl -Group1File9=C:\apache\README-NT.TXT -Group2Size=133120 -Group2Files=10 -Group2Name=Additional Modules -Group2Dir=<INSTALLDIR>\modules -Group2Update=0 -Group2TargetOS=-1 -Group2File1=C:\Apache\modules\ApacheModuleDigest.dll -Group2File2=C:\Apache\modules\ApacheModuleCERNMeta.dll -Group2File3=C:\Apache\modules\ApacheModuleAuthAnon.dll -Group2File4=C:\Apache\modules\ApacheModuleExpires.dll -Group2File5=C:\Apache\modules\ApacheModuleHeaders.dll -Group2File6=C:\Apache\modules\ApacheModuleProxy.dll -Group2File7=C:\Apache\modules\ApacheModuleSpeling.dll -Group2File8=C:\Apache\modules\ApacheModuleStatus.dll -Group2File9=C:\Apache\modules\ApacheModuleUserTrack.dll -Group2File10=C:\apache\modules\ApacheModuleRewrite.dll -Group3Size=49860 -Group3Files=6 -Group3Name=Configuration Files -Group3Dir=<INSTALLDIR>\.tmp -Group3Update=0 -Group3TargetOS=-1 -Group3File1=C:\Apache\conf\httpd.conf-dist-win -Group3File2=C:\Apache\conf\access.conf-dist-win -Group3File3=C:\Apache\conf\magic -Group3File4=C:\Apache\conf\mime.types -Group3File5=C:\Apache\conf\srm.conf-dist-win -Group3File6=C:\apache\conf\highperformance.conf-dist -Group4Size=3999 -Group4Files=2 -Group4Name=Initial Document Root Files -Group4Dir=<INSTALLDIR>\.tmp -Group4Update=1 -Group4TargetOS=-1 -Group4File1=C:\Apache\htdocs\index.html -Group4File2=C:\apache\htdocs\apache_pb.gif -Group5Size=295033 -Group5Files=34 -Group5Name=Manual -Group5Dir=<INSTALLDIR>\htdocs\manual -Group5Update=0 -Group5TargetOS=-1 -Group5File1=C:\apache\htdocs\manual\custom-error.html -Group5File2=C:\apache\htdocs\manual\content-negotiation.html -Group5File3=C:\apache\htdocs\manual\cgi_path.html -Group5File4=C:\apache\htdocs\manual\dns-caveats.html -Group5File5=C:\apache\htdocs\manual\dso.html -Group5File6=C:\apache\htdocs\manual\ebcdic.html -Group5File7=C:\apache\htdocs\manual\env.html -Group5File8=C:\apache\htdocs\manual\footer.html -Group5File9=C:\apache\htdocs\manual\handler.html -Group5File10=C:\apache\htdocs\manual\header.html -Group5File11=C:\apache\htdocs\manual\index.html -Group5File12=C:\apache\htdocs\manual\install.html -Group5File13=C:\apache\htdocs\manual\invoking.html -Group5File14=C:\apache\htdocs\manual\keepalive.html -Group5File15=C:\apache\htdocs\manual\LICENSE -Group5File16=C:\apache\htdocs\manual\location.html -Group5File17=C:\apache\htdocs\manual\man-template.html -Group5File18=C:\apache\htdocs\manual\multilogs.html -Group5File19=C:\apache\htdocs\manual\new_features_1_0.html -Group5File20=C:\apache\htdocs\manual\new_features_1_1.html -Group5File21=C:\apache\htdocs\manual\new_features_1_2.html -Group5File22=C:\apache\htdocs\manual\new_features_1_3.html -Group5File23=C:\apache\htdocs\manual\process-model.html -Group5File24=C:\apache\htdocs\manual\sections.html -Group5File25=C:\apache\htdocs\manual\sourcereorg.html -Group5File26=C:\apache\htdocs\manual\stopping.html -Group5File27=C:\apache\htdocs\manual\suexec.html -Group5File28=C:\apache\htdocs\manual\unixware.html -Group5File29=C:\apache\htdocs\manual\upgrading_to_1_3.html -Group5File30=C:\apache\htdocs\manual\windows.html -Group5File31=C:\apache\htdocs\manual\bind.html -Group5File32=C:\apache\htdocs\manual\suexec_1_2.html -Group5File33=C:\apache\htdocs\manual\install-tpf.html -Group5File34=C:\apache\htdocs\manual\readme-tpf.html -Group6Size=42478 -Group6Files=8 -Group6Name=images -Group6Dir=[Manual]\images -Group6Update=0 -Group6TargetOS=-1 -Group6File1=C:\Apache\htdocs\manual\images\custom_errordocs.gif -Group6File2=C:\Apache\htdocs\manual\images\home.gif -Group6File3=C:\Apache\htdocs\manual\images\index.gif -Group6File4=C:\Apache\htdocs\manual\images\sub.gif -Group6File5=C:\apache\htdocs\manual\images\mod_rewrite_fig1.fig -Group6File6=C:\apache\htdocs\manual\images\mod_rewrite_fig1.gif -Group6File7=C:\apache\htdocs\manual\images\mod_rewrite_fig2.fig -Group6File8=C:\apache\htdocs\manual\images\mod_rewrite_fig2.gif -Group7Size=329371 -Group7Files=22 -Group7Name=misc -Group7Dir=[Manual]\misc -Group7Update=0 -Group7TargetOS=-1 -Group7File1=C:\Apache\htdocs\manual\misc\API.html -Group7File2=C:\Apache\htdocs\manual\misc\client_block_api.html -Group7File3=C:\Apache\htdocs\manual\misc\compat_notes.html -Group7File4=C:\Apache\htdocs\manual\misc\custom_errordocs.html -Group7File5=C:\Apache\htdocs\manual\misc\descriptors.html -Group7File6=C:\Apache\htdocs\manual\misc\FAQ.html -Group7File7=C:\Apache\htdocs\manual\misc\fin_wait_2.html -Group7File8=C:\Apache\htdocs\manual\misc\footer.html -Group7File9=C:\Apache\htdocs\manual\misc\header.html -Group7File10=C:\Apache\htdocs\manual\misc\howto.html -Group7File11=C:\Apache\htdocs\manual\misc\index.html -Group7File12=C:\Apache\htdocs\manual\misc\known_client_problems.html -Group7File13=C:\Apache\htdocs\manual\misc\nopgp.html -Group7File14=C:\Apache\htdocs\manual\misc\perf-bsd44.html -Group7File15=C:\Apache\htdocs\manual\misc\perf-dec.html -Group7File16=C:\Apache\htdocs\manual\misc\perf-hp.html -Group7File17=C:\Apache\htdocs\manual\misc\perf-tuning.html -Group7File18=C:\Apache\htdocs\manual\misc\perf.html -Group7File19=C:\Apache\htdocs\manual\misc\security_tips.html -Group7File20=C:\Apache\htdocs\manual\misc\vif-info.html -Group7File21=C:\Apache\htdocs\manual\misc\windoz_keepalive.html -Group7File22=C:\apache\htdocs\manual\misc\HTTP_Features.tsv -Group8Size=558131 -Group8Files=48 -Group8Name=mod -Group8Dir=[Manual]\mod -Group8Update=0 -Group8TargetOS=-1 -Group8File1=C:\Apache\htdocs\manual\mod\core.html -Group8File2=C:\Apache\htdocs\manual\mod\directive-dict.html -Group8File3=C:\Apache\htdocs\manual\mod\directives.html -Group8File4=C:\Apache\htdocs\manual\mod\footer.html -Group8File5=C:\Apache\htdocs\manual\mod\header.html -Group8File6=C:\Apache\htdocs\manual\mod\index.html -Group8File7=C:\Apache\htdocs\manual\mod\mod_access.html -Group8File8=C:\Apache\htdocs\manual\mod\mod_actions.html -Group8File9=C:\Apache\htdocs\manual\mod\mod_alias.html -Group8File10=C:\Apache\htdocs\manual\mod\mod_asis.html -Group8File11=C:\Apache\htdocs\manual\mod\mod_auth.html -Group8File12=C:\Apache\htdocs\manual\mod\mod_auth_anon.html -Group8File13=C:\Apache\htdocs\manual\mod\mod_auth_db.html -Group8File14=C:\Apache\htdocs\manual\mod\mod_auth_dbm.html -Group8File15=C:\Apache\htdocs\manual\mod\mod_autoindex.html -Group8File16=C:\Apache\htdocs\manual\mod\mod_browser.html -Group8File17=C:\Apache\htdocs\manual\mod\mod_cern_meta.html -Group8File18=C:\Apache\htdocs\manual\mod\mod_cgi.html -Group8File19=C:\Apache\htdocs\manual\mod\mod_cookies.html -Group8File20=C:\Apache\htdocs\manual\mod\mod_digest.html -Group8File21=C:\Apache\htdocs\manual\mod\mod_dir.html -Group8File22=C:\Apache\htdocs\manual\mod\mod_dld.html -Group8File23=C:\Apache\htdocs\manual\mod\mod_dll.html -Group8File24=C:\Apache\htdocs\manual\mod\mod_env.html -Group8File25=C:\Apache\htdocs\manual\mod\mod_example.html -Group8File26=C:\Apache\htdocs\manual\mod\mod_expires.html -Group8File27=C:\Apache\htdocs\manual\mod\mod_headers.html -Group8File28=C:\Apache\htdocs\manual\mod\mod_imap.html -Group8File29=C:\Apache\htdocs\manual\mod\mod_include.html -Group8File30=C:\Apache\htdocs\manual\mod\mod_info.html -Group8File31=C:\Apache\htdocs\manual\mod\mod_isapi.html -Group8File32=C:\Apache\htdocs\manual\mod\mod_log_agent.html -Group8File33=C:\Apache\htdocs\manual\mod\mod_log_common.html -Group8File34=C:\Apache\htdocs\manual\mod\mod_log_config.html -Group8File35=C:\Apache\htdocs\manual\mod\mod_log_referer.html -Group8File36=C:\Apache\htdocs\manual\mod\mod_mime.html -Group8File37=C:\Apache\htdocs\manual\mod\mod_mime_magic.html -Group8File38=C:\Apache\htdocs\manual\mod\mod_negotiation.html -Group8File39=C:\Apache\htdocs\manual\mod\mod_proxy.html -Group8File40=C:\Apache\htdocs\manual\mod\mod_rewrite.html -Group8File41=C:\Apache\htdocs\manual\mod\mod_setenvif.html -Group8File42=C:\Apache\htdocs\manual\mod\mod_so.html -Group8File43=C:\Apache\htdocs\manual\mod\mod_speling.html -Group8File44=C:\Apache\htdocs\manual\mod\mod_status.html -Group8File45=C:\Apache\htdocs\manual\mod\mod_unique_id.html -Group8File46=C:\Apache\htdocs\manual\mod\mod_userdir.html -Group8File47=C:\Apache\htdocs\manual\mod\mod_usertrack.html -Group8File48=C:\apache\htdocs\manual\mod\mod_mmap_static.html -Group9Size=112629 -Group9Files=13 -Group9Name=vhosts -Group9Dir=[Manual]\vhosts -Group9Update=0 -Group9TargetOS=-1 -Group9File1=C:\Apache\htdocs\manual\vhosts\details.html -Group9File2=C:\Apache\htdocs\manual\vhosts\details_1_2.html -Group9File3=C:\Apache\htdocs\manual\vhosts\examples.html -Group9File4=C:\Apache\htdocs\manual\vhosts\fd-limits.html -Group9File5=C:\Apache\htdocs\manual\vhosts\footer.html -Group9File6=C:\Apache\htdocs\manual\vhosts\header.html -Group9File7=C:\Apache\htdocs\manual\vhosts\host.html -Group9File8=C:\Apache\htdocs\manual\vhosts\index.html -Group9File9=C:\Apache\htdocs\manual\vhosts\ip-based.html -Group9File10=C:\Apache\htdocs\manual\vhosts\name-based.html -Group9File11=C:\Apache\htdocs\manual\vhosts\vhosts-in-depth.html -Group9File12=C:\Apache\htdocs\manual\vhosts\virtual-host.html -Group9File13=C:\apache\htdocs\manual\vhosts\mass.html -Group10Size=523748 -Group10Files=19 -Group10Name=src -Group10Dir=<INSTALLDIR>\src -Group10Update=0 -Group10TargetOS=-1 -Group10File1=C:\Apache\src\.gdbinit -Group10File2=C:\Apache\src\Apache.dsp -Group10File3=C:\Apache\src\Apache.mak -Group10File4=C:\Apache\src\ApacheCore.def -Group10File5=C:\Apache\src\ApacheCore.dsp -Group10File6=C:\Apache\src\ApacheCore.mak -Group10File7=C:\Apache\src\buildmark.c -Group10File8=C:\Apache\src\CHANGES -Group10File9=C:\Apache\src\Configuration.tmpl -Group10File10=C:\Apache\src\Configure -Group10File11=C:\Apache\src\INSTALL -Group10File12=C:\Apache\src\Makefile.nt -Group10File13=C:\Apache\src\Makefile.tmpl -Group10File14=C:\Apache\src\PORTING -Group10File15=C:\Apache\src\README -Group10File16=C:\Apache\src\README.EBCDIC -Group10File17=C:\apache\src\BUILD.NOTES -Group10File18=C:\apache\src\Makefile_win32.txt -Group10File19=C:\apache\src\Makefile_win32_debug.txt -Group11Size=92924 -Group11Files=10 -Group11Name=ap -Group11Dir=[src]\ap -Group11Update=0 -Group11TargetOS=-1 -Group11File1=C:\Apache\src\ap\ap.dsp -Group11File2=C:\Apache\src\ap\ap.mak -Group11File3=C:\Apache\src\ap\ap_cpystrn.c -Group11File4=C:\Apache\src\ap\ap_execve.c -Group11File5=C:\Apache\src\ap\ap_signal.c -Group11File6=C:\Apache\src\ap\ap_slack.c -Group11File7=C:\Apache\src\ap\ap_snprintf.c -Group11File8=C:\Apache\src\ap\Makefile.tmpl -Group11File9=C:\apache\src\ap\ap_fnmatch.c -Group11File10=C:\apache\src\ap\ap_md5c.c -Group12Size=255397 -Group12Files=29 -Group12Name=include -Group12Dir=[src]\include -Group12Update=0 -Group12TargetOS=-1 -Group12File1=C:\Apache\src\include\alloc.h -Group12File2=C:\Apache\src\include\ap.h -Group12File3=C:\Apache\src\include\buff.h -Group12File4=C:\Apache\src\include\conf.h -Group12File5=C:\Apache\src\include\explain.h -Group12File6=C:\Apache\src\include\fnmatch.h -Group12File7=C:\Apache\src\include\hsregex.h -Group12File8=C:\Apache\src\include\httpd.h -Group12File9=C:\Apache\src\include\http_config.h -Group12File10=C:\Apache\src\include\http_conf_globals.h -Group12File11=C:\Apache\src\include\http_core.h -Group12File12=C:\Apache\src\include\http_log.h -Group12File13=C:\Apache\src\include\http_main.h -Group12File14=C:\Apache\src\include\http_protocol.h -Group12File15=C:\Apache\src\include\http_request.h -Group12File16=C:\Apache\src\include\http_vhost.h -Group12File17=C:\Apache\src\include\ap_md5.h -Group12File18=C:\Apache\src\include\multithread.h -Group12File19=C:\Apache\src\include\rfc1413.h -Group12File20=C:\Apache\src\include\scoreboard.h -Group12File21=C:\Apache\src\include\util_date.h -Group12File22=C:\Apache\src\include\util_md5.h -Group12File23=C:\Apache\src\include\util_script.h -Group12File24=C:\apache\src\include\compat.h -Group12File25=C:\apache\src\include\util_uri.h -Group12File26=C:\apache\src\include\ap_compat.h -Group12File27=C:\apache\src\include\ap_config.h -Group12File28=C:\apache\src\include\ap_ctype.h -Group12File29=C:\apache\src\include\ap_mmn.h -Group13Size=789788 -Group13Files=22 -Group13Name=main -Group13Dir=[src]\main -Group13Update=0 -Group13TargetOS=-1 -Group13File1=C:\apache\src\main\alloc.c -Group13File2=C:\apache\src\main\buff.c -Group13File3=C:\apache\src\main\gen_test_char.c -Group13File4=C:\apache\src\main\gen_test_char.dsp -Group13File5=C:\apache\src\main\gen_test_char.mak -Group13File6=C:\apache\src\main\gen_uri_delims.c -Group13File7=C:\apache\src\main\gen_uri_delims.dsp -Group13File8=C:\apache\src\main\gen_uri_delims.mak -Group13File9=C:\apache\src\main\http_config.c -Group13File10=C:\apache\src\main\http_core.c -Group13File11=C:\apache\src\main\http_log.c -Group13File12=C:\apache\src\main\http_main.c -Group13File13=C:\apache\src\main\http_protocol.c -Group13File14=C:\apache\src\main\http_request.c -Group13File15=C:\apache\src\main\http_vhost.c -Group13File16=C:\apache\src\main\Makefile.tmpl -Group13File17=C:\apache\src\main\rfc1413.c -Group13File18=C:\apache\src\main\util.c -Group13File19=C:\apache\src\main\util_date.c -Group13File20=C:\apache\src\main\util_md5.c -Group13File21=C:\apache\src\main\util_script.c -Group13File22=C:\apache\src\main\util_uri.c -Group14Size=895 -Group14Files=1 -Group14Name=modules -Group14Dir=[src]\modules -Group14Update=0 -Group14TargetOS=-1 -Group14File1=C:\Apache\src\modules\README -Group15Size=48416 -Group15Files=3 -Group15Name=example -Group15Dir=[modules]\example -Group15Update=0 -Group15TargetOS=-1 -Group15File1=C:\Apache\src\modules\example\Makefile.tmpl -Group15File2=C:\Apache\src\modules\example\mod_example.c -Group15File3=C:\Apache\src\modules\example\README -Group16Size=13194 -Group16Files=2 -Group16Name=experimental -Group16Dir=[modules]\experimental -Group16Update=0 -Group16TargetOS=-1 -Group16File1=C:\Apache\src\modules\experimental\Makefile.tmpl -Group16File2=C:\Apache\src\modules\experimental\mod_mmap_static.c -Group17Size=69 -Group17Files=1 -Group17Name=extra -Group17Dir=[modules]\extra -Group17Update=0 -Group17TargetOS=-1 -Group17File1=C:\Apache\src\modules\extra\Makefile.tmpl -Group18Size=205708 -Group18Files=11 -Group18Name=proxy -Group18Dir=[modules]\proxy -Group18Update=0 -Group18TargetOS=-1 -Group18File1=C:\apache\src\modules\proxy\ApacheModuleProxy.dsp -Group18File2=C:\apache\src\modules\proxy\ApacheModuleProxy.mak -Group18File3=C:\apache\src\modules\proxy\Makefile.libdir -Group18File4=C:\apache\src\modules\proxy\Makefile.tmpl -Group18File5=C:\apache\src\modules\proxy\mod_proxy.c -Group18File6=C:\apache\src\modules\proxy\mod_proxy.h -Group18File7=C:\apache\src\modules\proxy\proxy_cache.c -Group18File8=C:\apache\src\modules\proxy\proxy_connect.c -Group18File9=C:\apache\src\modules\proxy\proxy_ftp.c -Group18File10=C:\apache\src\modules\proxy\proxy_http.c -Group18File11=C:\apache\src\modules\proxy\proxy_util.c -Group19Size=863524 -Group19Files=36 -Group19Name=standard -Group19Dir=[modules]\standard -Group19Update=0 -Group19TargetOS=-1 -Group19File1=C:\apache\src\modules\standard\Makefile.tmpl -Group19File2=C:\apache\src\modules\standard\mod_access.c -Group19File3=C:\apache\src\modules\standard\mod_actions.c -Group19File4=C:\apache\src\modules\standard\mod_alias.c -Group19File5=C:\apache\src\modules\standard\mod_asis.c -Group19File6=C:\apache\src\modules\standard\mod_auth.c -Group19File7=C:\apache\src\modules\standard\mod_auth_anon.c -Group19File8=C:\apache\src\modules\standard\mod_auth_db.c -Group19File9=C:\apache\src\modules\standard\mod_auth_db.module -Group19File10=C:\apache\src\modules\standard\mod_auth_dbm.c -Group19File11=C:\apache\src\modules\standard\mod_autoindex.c -Group19File12=C:\apache\src\modules\standard\mod_cern_meta.c -Group19File13=C:\apache\src\modules\standard\mod_cgi.c -Group19File14=C:\apache\src\modules\standard\mod_digest.c -Group19File15=C:\apache\src\modules\standard\mod_dir.c -Group19File16=C:\apache\src\modules\standard\mod_env.c -Group19File17=C:\apache\src\modules\standard\mod_expires.c -Group19File18=C:\apache\src\modules\standard\mod_headers.c -Group19File19=C:\apache\src\modules\standard\mod_imap.c -Group19File20=C:\apache\src\modules\standard\mod_include.c -Group19File21=C:\apache\src\modules\standard\mod_info.c -Group19File22=C:\apache\src\modules\standard\mod_log_agent.c -Group19File23=C:\apache\src\modules\standard\mod_log_config.c -Group19File24=C:\apache\src\modules\standard\mod_log_referer.c -Group19File25=C:\apache\src\modules\standard\mod_mime.c -Group19File26=C:\apache\src\modules\standard\mod_mime_magic.c -Group19File27=C:\apache\src\modules\standard\mod_negotiation.c -Group19File28=C:\apache\src\modules\standard\mod_rewrite.c -Group19File29=C:\apache\src\modules\standard\mod_rewrite.h -Group19File30=C:\apache\src\modules\standard\mod_setenvif.c -Group19File31=C:\apache\src\modules\standard\mod_so.c -Group19File32=C:\apache\src\modules\standard\mod_speling.c -Group19File33=C:\apache\src\modules\standard\mod_status.c -Group19File34=C:\apache\src\modules\standard\mod_unique_id.c -Group19File35=C:\apache\src\modules\standard\mod_userdir.c -Group19File36=C:\apache\src\modules\standard\mod_usertrack.c -Group20Size=170796 -Group20Files=25 -Group20Name=regex -Group20Dir=[src]\regex -Group20Update=0 -Group20TargetOS=-1 -Group20File1=C:\Apache\src\regex\cclass.h -Group20File2=C:\Apache\src\regex\cname.h -Group20File3=C:\Apache\src\regex\COPYRIGHT -Group20File4=C:\Apache\src\regex\debug.c -Group20File5=C:\Apache\src\regex\engine.c -Group20File6=C:\Apache\src\regex\engine.ih -Group20File7=C:\Apache\src\regex\main.c -Group20File8=C:\Apache\src\regex\Makefile.tmpl -Group20File9=C:\Apache\src\regex\mkh -Group20File10=C:\Apache\src\regex\README -Group20File11=C:\Apache\src\regex\regcomp.c -Group20File12=C:\Apache\src\regex\regcomp.ih -Group20File13=C:\Apache\src\regex\regerror.c -Group20File14=C:\Apache\src\regex\regerror.ih -Group20File15=C:\Apache\src\regex\regex.3 -Group20File16=C:\Apache\src\regex\regex.7 -Group20File17=C:\Apache\src\regex\regex.dsp -Group20File18=C:\Apache\src\regex\regex.mak -Group20File19=C:\Apache\src\regex\regex2.h -Group20File20=C:\Apache\src\regex\regexec.c -Group20File21=C:\Apache\src\regex\regfree.c -Group20File22=C:\Apache\src\regex\split.c -Group20File23=C:\Apache\src\regex\tests -Group20File24=C:\Apache\src\regex\utils.h -Group20File25=C:\Apache\src\regex\WHATSNEW -Group21Size=210232 -Group21Files=28 -Group21Name=support -Group21Dir=[src]\support -Group21Update=0 -Group21TargetOS=-1 -Group21File1=C:\apache\src\support\ab.c -Group21File2=C:\apache\src\support\apachectl -Group21File3=C:\apache\src\support\apxs.8 -Group21File4=C:\apache\src\support\apxs.pl -Group21File5=C:\apache\src\support\dbmmanage -Group21File6=C:\apache\src\support\dbmmanage.1 -Group21File7=C:\apache\src\support\htdigest.1 -Group21File8=C:\apache\src\support\htdigest.c -Group21File9=C:\apache\src\support\htpasswd.1 -Group21File10=C:\apache\src\support\htpasswd.c -Group21File11=C:\apache\src\support\httpd.8 -Group21File12=C:\apache\src\support\log_server_status -Group21File13=C:\apache\src\support\logresolve.8 -Group21File14=C:\apache\src\support\logresolve.c -Group21File15=C:\apache\src\support\logresolve.pl -Group21File16=C:\apache\src\support\Makefile.tmpl -Group21File17=C:\apache\src\support\phf_abuse_log.cgi -Group21File18=C:\apache\src\support\rotatelogs.8 -Group21File19=C:\apache\src\support\rotatelogs.c -Group21File20=C:\apache\src\support\split-logfile -Group21File21=C:\apache\src\support\suexec.8 -Group21File22=C:\apache\src\support\suexec.c -Group21File23=C:\apache\src\support\suexec.h -Group21File24=C:\apache\src\support\httpd.exp -Group21File25=C:\apache\src\support\htpasswd.dsp -Group21File26=C:\apache\src\support\htpasswd.mak -Group21File27=C:\apache\src\support\ab.8 -Group21File28=C:\apache\src\support\apachectl.8 -Group22Size=0 -Group22Files=0 -Group22Name=os -Group22Dir=[src]\os -Group22Update=0 -Group22TargetOS=-1 -Group23Size=210812 -Group23Files=46 -Group23Name=win32 -Group23Dir=[os]\win32 -Group23Update=0 -Group23TargetOS=-1 -Group23File1=C:\apache\src\os\win32\ApacheModuleAuthAnon.dsp -Group23File2=C:\apache\src\os\win32\ApacheModuleAuthAnon.mak -Group23File3=C:\apache\src\os\win32\ApacheModuleCERNMeta.dsp -Group23File4=C:\apache\src\os\win32\ApacheModuleCERNMeta.mak -Group23File5=C:\apache\src\os\win32\ApacheModuleDigest.dsp -Group23File6=C:\apache\src\os\win32\ApacheModuleDigest.mak -Group23File7=C:\apache\src\os\win32\ApacheModuleExpires.dsp -Group23File8=C:\apache\src\os\win32\ApacheModuleExpires.mak -Group23File9=C:\apache\src\os\win32\ApacheModuleHeaders.dsp -Group23File10=C:\apache\src\os\win32\ApacheModuleHeaders.mak -Group23File11=C:\apache\src\os\win32\ApacheModuleInfo.dsp -Group23File12=C:\apache\src\os\win32\ApacheModuleInfo.mak -Group23File13=C:\apache\src\os\win32\ApacheModuleRewrite.dsp -Group23File14=C:\apache\src\os\win32\ApacheModuleRewrite.mak -Group23File15=C:\apache\src\os\win32\ApacheModuleSpeling.dsp -Group23File16=C:\apache\src\os\win32\ApacheModuleSpeling.mak -Group23File17=C:\apache\src\os\win32\ApacheModuleStatus.dsp -Group23File18=C:\apache\src\os\win32\ApacheModuleStatus.mak -Group23File19=C:\apache\src\os\win32\ApacheModuleUserTrack.dsp -Group23File20=C:\apache\src\os\win32\ApacheModuleUserTrack.mak -Group23File21=C:\apache\src\os\win32\ApacheOS.dsp -Group23File22=C:\apache\src\os\win32\ApacheOS.mak -Group23File23=C:\apache\src\os\win32\getopt.c -Group23File24=C:\apache\src\os\win32\getopt.h -Group23File25=C:\apache\src\os\win32\main_win32.c -Group23File26=C:\apache\src\os\win32\MakeModuleMak.cpp -Group23File27=C:\apache\src\os\win32\MakeModuleMak.mak -Group23File28=C:\apache\src\os\win32\mod_dll.c -Group23File29=C:\apache\src\os\win32\mod_isapi.c -Group23File30=C:\apache\src\os\win32\Module.mak.tmpl -Group23File31=C:\apache\src\os\win32\modules.c -Group23File32=C:\apache\src\os\win32\multithread.c -Group23File33=C:\apache\src\os\win32\os.c -Group23File34=C:\apache\src\os\win32\os.h -Group23File35=C:\apache\src\os\win32\passwd.c -Group23File36=C:\apache\src\os\win32\passwd.h -Group23File37=C:\apache\src\os\win32\readdir.c -Group23File38=C:\apache\src\os\win32\readdir.h -Group23File39=C:\apache\src\os\win32\registry.c -Group23File40=C:\apache\src\os\win32\registry.h -Group23File41=C:\apache\src\os\win32\service.c -Group23File42=C:\apache\src\os\win32\service.h -Group23File43=C:\apache\src\os\win32\util_win32.c -Group23File44=C:\apache\src\os\win32\apache.ico -Group23File45=C:\apache\src\os\win32\apache.rc -Group23File46=C:\apache\src\os\win32\resource.h -Group24Size=84480 -Group24Files=1 -Group24Name=Installer DLL -Group24Dir=<INSTALLDIR> -Group24Update=0 -Group24TargetOS=-1 -Group24File1=C:\Apache\install.dll -Group25Size=254005 -Group25Files=1 -Group25Name=Shared DLLs -Group25Dir=<WINSYSDIR> -Group25Update=0 -Group25TargetOS=-1 -Group25File1=C:\Apache\MSVCRT.DLL -Group26Size=0 -Group26Files=0 -Group26Name=logs -Group26Dir=<INSTALLDIR>\logs -Group26Update=0 -Group26TargetOS=-1 -Group27Size=37127 -Group27Files=76 -Group27Name=icons -Group27Dir=<INSTALLDIR>\icons -Group27Update=1 -Group27TargetOS=-1 -Group27File1=C:\apache\icons\a.gif -Group27File2=C:\apache\icons\alert.black.gif -Group27File3=C:\apache\icons\alert.red.gif -Group27File4=C:\apache\icons\apache_pb.gif -Group27File5=C:\apache\icons\back.gif -Group27File6=C:\apache\icons\ball.gray.gif -Group27File7=C:\apache\icons\ball.red.gif -Group27File8=C:\apache\icons\binary.gif -Group27File9=C:\apache\icons\binhex.gif -Group27File10=C:\apache\icons\blank.gif -Group27File11=C:\apache\icons\bomb.gif -Group27File12=C:\apache\icons\box1.gif -Group27File13=C:\apache\icons\box2.gif -Group27File14=C:\apache\icons\broken.gif -Group27File15=C:\apache\icons\burst.gif -Group27File16=C:\apache\icons\c.gif -Group27File17=C:\apache\icons\comp.blue.gif -Group27File18=C:\apache\icons\comp.gray.gif -Group27File19=C:\apache\icons\compressed.gif -Group27File20=C:\apache\icons\continued.gif -Group27File21=C:\apache\icons\dir.gif -Group27File22=C:\apache\icons\down.gif -Group27File23=C:\apache\icons\dvi.gif -Group27File24=C:\apache\icons\f.gif -Group27File25=C:\apache\icons\folder.gif -Group27File26=C:\apache\icons\folder.open.gif -Group27File27=C:\apache\icons\folder.sec.gif -Group27File28=C:\apache\icons\forward.gif -Group27File29=C:\apache\icons\generic.gif -Group27File30=C:\apache\icons\generic.red.gif -Group27File31=C:\apache\icons\generic.sec.gif -Group27File32=C:\apache\icons\hand.right.gif -Group27File33=C:\apache\icons\hand.up.gif -Group27File34=C:\apache\icons\icon.sheet.gif -Group27File35=C:\apache\icons\image1.gif -Group27File36=C:\apache\icons\image2.gif -Group27File37=C:\apache\icons\image3.gif -Group27File38=C:\apache\icons\index.gif -Group27File39=C:\apache\icons\layout.gif -Group27File40=C:\apache\icons\left.gif -Group27File41=C:\apache\icons\link.gif -Group27File42=C:\apache\icons\movie.gif -Group27File43=C:\apache\icons\p.gif -Group27File44=C:\apache\icons\patch.gif -Group27File45=C:\apache\icons\pdf.gif -Group27File46=C:\apache\icons\pie0.gif -Group27File47=C:\apache\icons\pie1.gif -Group27File48=C:\apache\icons\pie2.gif -Group27File49=C:\apache\icons\pie3.gif -Group27File50=C:\apache\icons\pie4.gif -Group27File51=C:\apache\icons\pie5.gif -Group27File52=C:\apache\icons\pie6.gif -Group27File53=C:\apache\icons\pie7.gif -Group27File54=C:\apache\icons\pie8.gif -Group27File55=C:\apache\icons\portal.gif -Group27File56=C:\apache\icons\ps.gif -Group27File57=C:\apache\icons\quill.gif -Group27File58=C:\apache\icons\README -Group27File59=C:\apache\icons\right.gif -Group27File60=C:\apache\icons\screw1.gif -Group27File61=C:\apache\icons\screw2.gif -Group27File62=C:\apache\icons\script.gif -Group27File63=C:\apache\icons\sound1.gif -Group27File64=C:\apache\icons\sound2.gif -Group27File65=C:\apache\icons\sphere1.gif -Group27File66=C:\apache\icons\sphere2.gif -Group27File67=C:\apache\icons\tar.gif -Group27File68=C:\apache\icons\tex.gif -Group27File69=C:\apache\icons\text.gif -Group27File70=C:\apache\icons\transfer.gif -Group27File71=C:\apache\icons\unknown.gif -Group27File72=C:\apache\icons\up.gif -Group27File73=C:\apache\icons\uu.gif -Group27File74=C:\apache\icons\uuencoded.gif -Group27File75=C:\apache\icons\world1.gif -Group27File76=C:\apache\icons\world2.gif -Group28Size=0 -Group28Files=0 -Group28Name=conf -Group28Dir=<INSTALLDIR>\conf -Group28Update=0 -Group28TargetOS=-1 -Group29Size=2326 -Group29Files=1 -Group29Name=htdocs -Group29Dir=<INSTALLDIR>\htdocs -Group29Update=0 -Group29TargetOS=-1 -Group29File1=C:\apache\htdocs\apache_pb.gif -Group30Size=0 -Group30Files=0 -Group30Name=cgi-bin -Group30Dir=<INSTALLDIR>\cgi-bin -Group30Update=0 -Group30TargetOS=-1 -Group31Size=37002 -Group31Files=2 -Group31Name=installer -Group31Dir=[win32]\installer -Group31Update=0 -Group31TargetOS=-1 -Group31File1=C:\apache\src\os\win32\installer\apache.iwz -Group31File2=C:\apache\src\os\win32\installer\README.TXT -Group32Size=30356 -Group32Files=4 -Group32Name=installdll -Group32Dir=[installer]\installdll -Group32Update=0 -Group32TargetOS=-1 -Group32File1=C:\apache\src\os\win32\installer\installdll\install.c -Group32File2=C:\apache\src\os\win32\installer\installdll\install.def -Group32File3=C:\apache\src\os\win32\installer\installdll\install.dsp -Group32File4=C:\apache\src\os\win32\installer\installdll\install.mak -Group33Size=8247 -Group33Files=33 -Group33Name=small -Group33Dir=[icons]\small -Group33Update=0 -Group33TargetOS=-1 -Group33File1=C:\apache\icons\small\back.gif -Group33File2=C:\apache\icons\small\binary.gif -Group33File3=C:\apache\icons\small\binhex.gif -Group33File4=C:\apache\icons\small\blank.gif -Group33File5=C:\apache\icons\small\broken.gif -Group33File6=C:\apache\icons\small\burst.gif -Group33File7=C:\apache\icons\small\comp1.gif -Group33File8=C:\apache\icons\small\comp2.gif -Group33File9=C:\apache\icons\small\compressed.gif -Group33File10=C:\apache\icons\small\continued.gif -Group33File11=C:\apache\icons\small\dir.gif -Group33File12=C:\apache\icons\small\dir2.gif -Group33File13=C:\apache\icons\small\forward.gif -Group33File14=C:\apache\icons\small\generic.gif -Group33File15=C:\apache\icons\small\generic2.gif -Group33File16=C:\apache\icons\small\generic3.gif -Group33File17=C:\apache\icons\small\image.gif -Group33File18=C:\apache\icons\small\image2.gif -Group33File19=C:\apache\icons\small\index.gif -Group33File20=C:\apache\icons\small\movie.gif -Group33File21=C:\apache\icons\small\rainbow.gif -Group33File22=C:\apache\icons\small\README.txt -Group33File23=C:\apache\icons\small\sound.gif -Group33File24=C:\apache\icons\small\sound2.gif -Group33File25=C:\apache\icons\small\tar.gif -Group33File26=C:\apache\icons\small\text.gif -Group33File27=C:\apache\icons\small\transfer.gif -Group33File28=C:\apache\icons\small\unknown.gif -Group33File29=C:\apache\icons\small\uu.gif -Group33File30=C:\apache\icons\small\key.gif -Group33File31=C:\apache\icons\small\patch.gif -Group33File32=C:\apache\icons\small\ps.gif -Group33File33=C:\apache\icons\small\doc.gif -Group34Size=21478 -Group34Files=8 -Group34Name=test -Group34Dir=[installdll]\test -Group34Update=0 -Group34TargetOS=-1 -Group34File1=C:\apache\src\os\win32\installer\installdll\test\resource.h -Group34File2=C:\apache\src\os\win32\installer\installdll\test\test.c -Group34File3=C:\apache\src\os\win32\installer\installdll\test\test.def -Group34File4=C:\apache\src\os\win32\installer\installdll\test\test.dsp -Group34File5=C:\apache\src\os\win32\installer\installdll\test\test.h -Group34File6=C:\apache\src\os\win32\installer\installdll\test\test.ico -Group34File7=C:\apache\src\os\win32\installer\installdll\test\test.mak -Group34File8=C:\apache\src\os\win32\installer\installdll\test\test.rc -Group35Size=58368 -Group35Files=1 -Group35Name=bin -Group35Dir=<INSTALLDIR>\bin -Group35Update=0 -Group35TargetOS=-1 -Group35File1=C:\apache\bin\htpasswd.exe -Group36Size=7223 -Group36Files=1 -Group36Name=search -Group36Dir=[manual]\search -Group36Update=0 -Group36TargetOS=-1 -Group36File1=C:\apache\htdocs\manual\search\manual-index.cgi - -[Sequence] -DestinationLocationDir=<ProgramFilesDir>\Apache Group\Apache -SelectProgramFolderName=Apache Web Server -LicenseAgreement=1 -LicenseAgreementFile=C:\Apache\LICENSE -ReadMeFileBrowser=1 -ReadMeFileBrowserFile=C:\apache\WARNING-NT.TXT -DestinationLocation=1 -SetupType=1 -CustomSetup=1 -SelectProgramFolder=1 -ProgressBar=1 -SetupComplete=1 -SetupCompleteExec= -SetupCompleteExecParam= -SetupCompleteExecReadme=[Program Executables]\README-NT.TXT - -[RegEntries] -Reg1Path=HKEY_CLASSES_ROOT -Reg1Val1Type=0 -Reg1Val1Name=(Default) -Reg1Val1Data=(value not set) -Reg1Vals=1 -Reg2Path=HKEY_CURRENT_USER -Reg2Val1Type=0 -Reg2Val1Name=(Default) -Reg2Val1Data=(value not set) -Reg2Vals=1 -Reg3Path=HKEY_LOCAL_MACHINE -Reg3Val1Type=0 -Reg3Val1Name=(Default) -Reg3Val1Data=(value not set) -Reg3Vals=1 -Reg4Path=HKEY_USERS -Reg4Val1Type=0 -Reg4Val1Name=(Default) -Reg4Val1Data=(value not set) -Reg4Vals=1 -Reg5Path=HKEY_CURRENT_CONFIG -Reg5Val1Type=0 -Reg5Val1Name=(Default) -Reg5Val1Data=(value not set) -Reg5Vals=1 -Reg6Path=HKEY_DYN_DATA -Reg6Val1Type=0 -Reg6Val1Name=(Default) -Reg6Val1Data=(value not set) -Reg6Vals=1 -Reg7Path=HKEY_LOCAL_MACHINE\SOFTWARE -Reg7Val1Type=0 -Reg7Val1Name=(Default) -Reg7Val1Data=(value not set) -Reg7Vals=1 -Reg8Path=HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group -Reg8Val1Type=0 -Reg8Val1Name=(Default) -Reg8Val1Data=(value not set) -Reg8Vals=1 -Reg9Path=HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group\Apache -Reg9Val1Type=0 -Reg9Val1Name=(Default) -Reg9Val1Data=(value not set) -Reg9Vals=1 -Reg10Path=HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group\Apache\1.3.7 dev -Reg10Val1Type=0 -Reg10Val1Name=(Default) -Reg10Val1Data=(value not set) -Reg10Val2Type=0 -Reg10Val2Name=ServerRoot -Reg10Val2Data=<INSTALLDIR> -Reg10Vals=2 -Regs=10 - -[Registry] -Reg1Path=HKEY_LOCAL_MACHINE\SOFTWARE -Reg2Path=HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group -Reg3Path=HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group\Apache -Reg4Path=HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group\Apache\1.3.7 dev -Reg5Path=HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group\Apache\1.3.7 dev -Reg5ValName=ServerRoot -Reg5ValType=0 -Reg5ValData=<INSTALLDIR> -Regs=5 - -[Icons] -Icons=5 -Icon1Param=-d "<INSTALLDIR>" -s -Icon1Cmd=[Program Executables]\Apache.exe -Icon1Description=Start Apache as console app -Icon1WorkingDir=[Program Executables] -Icon1IconFile=[Program Executables]\Apache.exe -Icon1RealFile=C:\Apache\Apache.exe -Icon1WhichIcon=0 -Icon1KeyVirtual=0 -Icon1KeyFlags=0 -Icon1StartMenu=0 -Icon1Window=0 -Icon2Param= -Icon2Cmd=[Manual]\index.html -Icon2Description=Apache Documentation -Icon2WorkingDir=[Manual] -Icon2IconFile= -Icon2RealFile=C:\Apache\htdocs\manual\index.html -Icon2WhichIcon=0 -Icon2KeyVirtual=0 -Icon2KeyFlags=0 -Icon2StartMenu=0 -Icon2Window=0 -Icon3Param=-d "<INSTALLDIR>" -i -Icon3Cmd=[Program Executables]\Apache.exe -Icon3Description=Install Apache as Service (NT only) -Icon3WorkingDir=[Program Executables] -Icon3IconFile= -Icon3RealFile=C:\Apache\Apache.exe -Icon3WhichIcon=0 -Icon3KeyVirtual=0 -Icon3KeyFlags=0 -Icon3StartMenu=0 -Icon3Window=0 -Icon4Param=-d "<INSTALLDIR>" -u -Icon4Cmd=[Program Executables]\Apache.exe -Icon4Description=Uninstall Apache Service (NT only) -Icon4WorkingDir=[Program Executables] -Icon4IconFile= -Icon4RealFile=C:\Apache\Apache.exe -Icon4WhichIcon=0 -Icon4KeyVirtual=0 -Icon4KeyFlags=0 -Icon4StartMenu=0 -Icon4Window=0 -Icon5Param=-d "<INSTALLDIR>" -k shutdown -Icon5Cmd=[Program Executables]\Apache.exe -Icon5Description=Shutdown Apache console app -Icon5WorkingDir=[Program Executables] -Icon5IconFile= -Icon5RealFile=C:\Apache\Apache.exe -Icon5WhichIcon=0 -Icon5KeyVirtual=0 -Icon5KeyFlags=0 -Icon5StartMenu=0 -Icon5Window=0 - -[VisualBasic] -PRJFile= - -[Ext] -Ext1Dlg=Setup Complete -Ext1Param1=[Installer DLL]\install.dll -Ext1Param2=BeforeExit -Ext1Op=DLL - -[Temp Files] -File1=C:\Apache\install.dll - -[Autoexec] -PathDir= -ShareLocks= -ShareFiles= -Command= - -[CopyToFloppy] -DriveOption=Path for a 1 File Installation. -DestinationPath= -DestinationPathOneFile=C:\ -Password= diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/install.c b/usr.sbin/httpd/src/os/win32/installer/installdll/install.c deleted file mode 100644 index 39da17a104d..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/install.c +++ /dev/null @@ -1,666 +0,0 @@ -/* Apache Installer */ - -/* - * 26/06/97 PCS 1.000 Initial version - * 22/02/98 PCS 1.001 Used the excellent NTemacs to apply proper formating - * 04/05/98 PCS 1.002 Copy conf files to *.conf.default, then to *.conf - * 16/02/99 PCS 1.003 Add logging to "install.log" in the installed directory - */ - -#define VERSION ( "1.003 " __DATE__ " " __TIME__ ) - -#include <winsock2.h> -#include <string.h> -#include <stdio.h> -#include <direct.h> -#include <time.h> - -#include "conf.h" -#include "ap.h" - -#ifdef strftime -#undef strftime -#endif - -#define AP_WIN32ERROR 1 - -/* Global to store the instance handle */ -HINSTANCE hInstance = NULL; - -static char *szLogFilename = NULL; -static FILE *fpLog = NULL; - -void LogMessage(char *fmt, ...) -{ - char buf[4000]; - va_list ap; - struct tm *tms; - time_t nowtime; - char *bp = buf; - int rv; - int free = sizeof(buf); - - if (!fpLog) { - return; - } - - nowtime = time(NULL); - tms = localtime(&nowtime); - rv = strftime(bp, free, "%c", tms); - bp += rv; - free -= rv; - if (free) { - *bp++ = ' '; - free--; - } - - va_start(ap, fmt); - rv = ap_vsnprintf(bp, free, fmt, ap); - va_end(ap); - - free -= rv; - - fprintf(fpLog, "%s\n", buf); -} - -/* - * MessageBox_error() is a helper function to display an error in a - * message box, optionally including a Win32 error message. If - * the "opt" argument is value AP_WIN32ERROR then get the last Win32 - * error (with GetLastError()) and add it on to the end of - * the output string. The output string is given as a printf-format - * and replacement arguments. The hWnd, title and mb_opt fields are - * passed on to the Win32 MessageBox() call. - */ - -int MessageBox_error(HWND hWnd, int opt, char *title, - int mb_opt, char *fmt, ...) -{ - char buf[1000]; - va_list ap; - int free = sizeof(buf); /* Number of bytes free in the buffer */ - int rv; - char *p; - - va_start(ap, fmt); - rv = ap_vsnprintf(buf, sizeof(buf), fmt, ap); - va_end(ap); - - free -= rv; - - if (opt & AP_WIN32ERROR && free > 3) { - /* We checked in the "if" that we have enough space in buf for - * at least three extra characters. - */ - p = buf + strlen(buf); - *p++ = '\r'; - *p++ = '\r'; - *p++ = '('; - free -= 3; - /* NB: buf is now not null terminated */ - - /* Now put the error message straight into buf. This function - * takes the free buffer size as the 6th argument. - */ - rv = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - GetLastError(), - 0, - p, - free, - NULL); - - if (rv == 0) { - /* FormatMessage failed, so get rid of the "\r\r(" we just placed - * in the buffer, since there is no system error message. - */ - p -= 3; - *p = '\0'; - free += 3; - } else { - free -= rv; - p += rv; - - /* Strip any trailing \r or \n characters to make it look nice on - * the screen. - */ - while (*(p-1) == '\r' || *(p-1) == '\n') - p--, free++; - *p = '\0'; - - /* Append a trailing ) */ - if (free >= 1) { - *p++ = ')'; - *p++ = '\0'; - } - } - } - - for (p = buf; *p; p++) { - if (*p == '\n' || *p == '\r') { - *p = ' '; - } - } - LogMessage("MSG %s", buf); - - return MessageBox(hWnd, buf, title, mb_opt); -} - -int OpenLog(HWND hwnd, char *dir, char *fn) -{ - szLogFilename = malloc(strlen(dir) + 1 + strlen(fn) + 1); - sprintf(szLogFilename, "%s\\%s", dir, fn); - - if ((fpLog = fopen(szLogFilename, "a+")) == NULL) { - MessageBox_error(hwnd, - AP_WIN32ERROR, - "Installation Problem", - MB_OK | MB_ICONSTOP, - "Cannot open log file %s", szLogFilename); - return -1; - } - return 0; -} - -void CloseLog(void) -{ - if (fpLog) { - fclose(fpLog); - } -} - -/* - * The next few functions handle expanding the @@ServerRoot@@ type - * sequences found in the distribution files. The main entry point - * is expandFile(), which is given a file to expand and the filename - * to write the expanded file it. It reads a line at a time, and - * if the line includes an "@@" sequence, calls expandLine() to - * expand the sequences. - * - * expandLine() looks for @@ sequences in the line, and when it finds - * one, looks for a corresponding entry in the replaceTable[]. If it - * finds one it writes the replacement value from the table into - * an output string. - * - * The helper function appendText() is used when expanding strings. It - * is called to copy text into an output buffer. If the output buffer - * is not big enough, it is expanded. This function also ensures that - * the output buffer is null terminated after each append operation. - * - * A table is used of values to replace, rather than just hardcoding - * the functionality, so we could replace additional values in the - * future. We also take care to ensure that the expanded line can be - * arbitrary length (though at the moment the lines read from the - * configuration files can only be up to 2000 characters). - */ - -/* - * Table of items to replace. The "value" elements are filled in at runtime - * by FillInReplaceTable(). Note that the "tmpl" element is case - * sensitive. - */ - -typedef struct { - char *tmpl; - char *value; -} REPLACEITEM; -typedef REPLACEITEM *REPLACETABLE; - -REPLACEITEM replaceHttpd[] = { - { "@@ServerRoot@@", NULL }, /* ServerRoot directory (i.e. install dir) */ - { NULL, NULL } -}; - -/* - * A relatively intelligent version of strcat, that expands the destination - * buffer if needed. - * - * On entry, ppBuf points to the output buffer, pnPos points to the offset - * of the current position within that buffer, and pnSize points to the - * current size of *ppBuf. pSrc points to the string to copy into the buffer, - * and nToCopy gives the number of characters to copy from pSrc. - * - * On exit, *ppBuf, *pnPos and *pnSize may have been updated if the output - * buffer needed to be expanded. The output buffer will be null terminated. - * Returns 0 on success, -1 on error. Does not report errors to the user. - */ - -int appendText(char **ppBuf, int *pnPos, int *pnSize, char *pSrc, int nToCopy) -{ - char *pBuf = *ppBuf; /* output buffer */ - int nPos = *pnPos; /* current offset into pBuf */ - int nSize = *pnSize; /* current size of pBuf */ - - while (nPos + nToCopy >= nSize) { - /* Not enough space, double size of output buffer. Note we use - * >= not > so that we have enough space for the NULL character - * in the output buffer */ - char *pBufNew; - - pBufNew = realloc(pBuf, nSize * 2); - if (!pBufNew) - return -1; - nSize *= 2; - - /* Update the max size and buffer pointer */ - *pnSize = nSize; - *ppBuf = pBuf = pBufNew; - } - - /* Ok, now we have enough space, copy the stuff */ - - strncpy(pBuf+nPos, pSrc, nToCopy); - nPos += nToCopy; - *pnPos = nPos; /* update current position */ - pBuf[nPos] = '\0'; /* append trailing NULL */ - - return 0; -} - -/* - * Expand all the sequences in an input line. Returns a pointer to the - * expanded line. The caller should free the returned data. - * The replaceTable argument is a table of sequences to expand. - * - * Returns NULL on error. Does not report errors to the user. - */ - -char *expandLine(char *in, REPLACETABLE replaceTable) -{ - REPLACEITEM *item; - char *pos; /* current position in input buffer */ - char *outbuf; /* output buffer */ - int outbuf_size; /* current size of output buffer */ - int outbuf_position; /* current position in output buffer */ - char *start; /* position to copy from in input buffer */ - - /* Create an initial output buffer. Guess that twice the input size - * is a good length, after expansion. Don't worry if we need more - * though, appendText() will expand as needed. - */ - outbuf_size = strlen(in) * 2; - outbuf_position = 0; - outbuf = malloc(outbuf_size); - if (!outbuf) - return NULL; - - start = in; /* mark the start of uncopied data */ - pos = in; /* current position in input buffer */ - - while (1) { - - /* Look for '@@' sequence, or end of input */ - if (*pos && !(*pos == '@' && *(pos+1) == '@')) { - pos++; - continue; - } - - if (!*pos) { - /* End of input string, copy the uncopied data */ - if (appendText(&outbuf, &outbuf_position, &outbuf_size, - start, pos-start) < 0) { - return NULL; - } - break; - } - - /* Found first @ of a possible token to replace. Look for end - * of the token - */ - for (item = replaceTable; item->tmpl; ++item) { - if (!strncmp(pos, item->tmpl, strlen(item->tmpl))) - break; - } - - if (item->tmpl) { - /* Found match. First copy the uncopied data from the input - * buffer (start through to pos-1), then copy the expanded - * value. */ - if (appendText(&outbuf, &outbuf_position, &outbuf_size, - start, pos-start) < 0) { - return NULL; - } - if (appendText(&outbuf, &outbuf_position, &outbuf_size, - item->value, strlen(item->value)) < 0) { - return NULL; - } - - /* Update current position to skip over the input buffer - * @@...@@ sequence, and update the "start" pointer to uncopied - * data - */ - pos += strlen(item->tmpl); - start = pos; - } - else { - /* The sequence did not exist in the replace table, so copy - * it as-is to the output. - */ - pos++; - } - } - - return outbuf; -} - -/* - * Some options to determine how we copy a file. Apart from OPT_NONE, these should - * be OR'able - */ - -typedef enum { - OPT_NONE = 0, - OPT_OVERWRITE = 1, /* Always overwrite destination file */ - OPT_EXPAND = 2, /* Expand any @@...@@ tokens in replaceHttpd */ - OPT_DELETESOURCE = 4, /* Delete the source file after the copy */ - OPT_SILENT = 8, /* Don't tell use about failures */ -} options_t; - -/* - * Copy a file, expanding sequences from the replaceTable argument. - * Returns 0 on success, -1 on error. Reports errors to user. - */ -#define MAX_INPUT_LINE 2000 -int WINAPI ExpandConfFile(HWND hwnd, LPSTR szInst, LPSTR szinFile, LPSTR szoutFile, REPLACETABLE replaceTable, options_t options) -{ - char inFile[_MAX_PATH]; - char outFile[_MAX_PATH]; - char inbuf[MAX_INPUT_LINE]; - FILE *infp; - FILE *outfp; - - ap_snprintf(inFile, sizeof(inFile), "%s\\%s", szInst, szinFile); - ap_snprintf(outFile, sizeof(outFile), "%s\\%s", szInst, szoutFile); - - if (!(infp = fopen(inFile, "r"))) { - MessageBox_error(hwnd, - AP_WIN32ERROR, - "Installation Problem", - MB_OK | MB_ICONSTOP, - "Cannot read file %s", inFile); - return -1; - } - if (! (options & OPT_OVERWRITE)) { - /* Overwrite not allowed if file does not exist */ - if ((outfp = fopen(outFile, "r"))) { - if (! (options & OPT_SILENT)) { - MessageBox_error(hwnd, - 0, - "File not overwritten", - MB_OK | MB_ICONWARNING, - "Preserving existing file %s.\r\r" - "The new version of this file has been left in %s", - outFile, inFile); - } - fclose(outfp); - fclose(infp); - return 0; - } - /* To get here, output file does not exist */ - } - if (!(outfp = fopen(outFile, "w"))) { - MessageBox_error(hwnd, - AP_WIN32ERROR, - "Installation Problem", - MB_OK | MB_ICONSTOP, - "Cannot write to file %s", outFile); - fclose(infp); - return -1; - } - - while (fgets(inbuf, MAX_INPUT_LINE, infp)) { - char *pos; - char *outbuf; - - /* Quickly look to see if this line contains any - * @@ tokens. If it doesn't, we don't need to bother - * called expandLine() or taking a copy of the input - * buffer. - */ - if (options & OPT_EXPAND) { - for (pos = inbuf; *pos; ++pos) - if (*pos == '@' && *(pos+1) == '@') - break; - } - - if (options & OPT_EXPAND && *pos) { - /* The input line contains at least one '@@' sequence, so - * call expandLine() to expand any sequences we know about. - */ - outbuf = expandLine(inbuf, replaceTable); - if (outbuf == NULL) { - fclose(infp); - fclose(outfp); - MessageBox_error(hwnd, - 0, - "Installation Problem", - MB_OK|MB_ICONSTOP, - "An error occurred during installation"); - return -1; - } - } - else { - outbuf = NULL; - } - - /* If outbuf is NULL, we did not need to expand sequences, so - * just output the contents of the input buffer. - */ - fwrite(outbuf ? outbuf : inbuf, 1, - strlen(outbuf ? outbuf : inbuf), outfp); - - if (outbuf) - free(outbuf); - } - fclose(infp); - fclose(outfp); - - LogMessage("COPY: expanded %s to %s", inFile, outFile); - - if (options & OPT_DELETESOURCE) { - unlink(inFile); - LogMessage("COPY: deleted file %s", inFile); - } - - return 0; -} - -int FillInReplaceTable(HWND hwnd, REPLACETABLE table, char *szInst) -{ - REPLACEITEM *item; - for (item = table; item->tmpl; ++item) { - if (!strcmp(item->tmpl, "@@ServerRoot@@")) { - char *p; - -#if NEED_SHORT_PATHS - int len; - len = GetShortPathName(szInst, NULL, 0); - if (len > 0) { - item->value = (char*)malloc(len+1); - GetShortPathName(szInst, item->value, len); - } -#else - if ((item->value = strdup(szInst)) == NULL) - return -1; -#endif - for (p = item->value; *p; p++) - if (*p == '\\') *p = '/'; - - LogMessage("FillInReplaceTable tmpl=%s value=%s", item->tmpl, item->value); - - continue; - } -#if NEED_FQDN - if (!strcmp(item->tmpl, "FQDN")) { - item->value = GetHostName(hwnd); - continue; - } -#endif - } - return 0; -} - -/* - * actionTable[] contains things we do when this DLL is called by InstallShield - * during the install. It is like a simple script, without us having to - * worry about parsing, error checking, etc. - * - * Each item in the table is of type ACTIONITEM. The first element is the action - * to perform (e.g. CMD_COPY). The second and third elements are filenames - * (e.g. for CMD_COPY, the first filename is the source and the second filename - * is the destination). The final element of ACTIONITEM is a set of options - * which apply to the current "command". For example, OPT_EXPAND on a CMD_COPY - * line, tells the copy function to expand @@ServerRoot@@ tokens found in the - * source file. - * - * The contents of this table are performed in order, top to bottom. This lets - * us expand the files to the *.conf.default names, then copy to *.conf only - * if the corresponding *.conf file does not already exist. If it does exist, - * it is not overwritten. - * - * Return 1 on success, 0 on error. - */ - -typedef enum { - CMD_COPY = 0, - CMD_RMDIR, - CMD_RM, - CMD_END -} cmd_t; - -typedef struct { - cmd_t command; - char *in; - char *out; - options_t options; -} ACTIONITEM; -typedef ACTIONITEM *ACTIONTABLE; - -ACTIONITEM actionTable[] = { - /* - * Installation of the configuraton files. These are installed into the ".tmp" - * directory by the installer. We first move them to conf\*.default (overwriting - * any *.default file from a previous install). The *.conf-dist-win files - * are also expanded for any @@...@@ tokens. Then we copy the conf\*.default - * file to corresponding conf\* file, unless that would overwrite an existing file. - */ - { CMD_COPY, ".tmp\\mime.types", "conf\\mime.types.default", - OPT_OVERWRITE|OPT_DELETESOURCE }, - { CMD_COPY, ".tmp\\magic", "conf\\magic.default", - OPT_OVERWRITE|OPT_DELETESOURCE }, - { CMD_COPY, ".tmp\\httpd.conf-dist-win", "conf\\httpd.conf.default", - OPT_OVERWRITE|OPT_EXPAND|OPT_DELETESOURCE }, - { CMD_COPY, ".tmp\\srm.conf-dist-win", "conf\\srm.conf.default", - OPT_OVERWRITE|OPT_EXPAND|OPT_DELETESOURCE }, - { CMD_COPY, ".tmp\\access.conf-dist-win", "conf\\access.conf.default", - OPT_OVERWRITE|OPT_EXPAND|OPT_DELETESOURCE }, - - /* Now copy to the 'live' files, unless they already exist */ - { CMD_COPY, "conf\\httpd.conf.default", "conf\\httpd.conf", OPT_NONE }, - { CMD_COPY, "conf\\srm.conf.default", "conf\\srm.conf", OPT_NONE }, - { CMD_COPY, "conf\\access.conf.default", "conf\\access.conf", OPT_NONE }, - { CMD_COPY, "conf\\magic.default", "conf\\magic", OPT_NONE }, - { CMD_COPY, "conf\\mime.types.default", "conf\\mime.types", OPT_NONE }, - - { CMD_COPY, ".tmp\\highperformance.conf-dist", "conf\\highperformance.conf-dist", - OPT_EXPAND|OPT_OVERWRITE|OPT_DELETESOURCE }, - - { CMD_RMDIR, ".tmp", NULL }, - - { CMD_END, NULL, NULL, OPT_NONE } -}; - -/* - * BeforeExit() is the DLL call from InstallShield. The arguments and - * return value as defined by the installer. We are only interested - * in the install directory, szInst. Return 0 on error and 1 on - * success (!?). - */ - -CHAR WINAPI BeforeExit(HWND hwnd, LPSTR szSrcDir, LPSTR szSupport, LPSTR szInst, LPSTR szRes) -{ - ACTIONITEM *pactionItem; - int end = 0; - - OpenLog(hwnd, szInst, "install.log"); - LogMessage("STARTED %s", VERSION); - LogMessage("src=%s support=%s inst=%s", - szSrcDir, szSupport, szInst); - - FillInReplaceTable(hwnd, replaceHttpd, szInst); - - pactionItem = actionTable; - while (!end) { - - LogMessage("command=%d 1in=%s out=%s options=%d", - pactionItem->command, - pactionItem->in ? pactionItem->in : "NULL", - pactionItem->out ? pactionItem->out : "NULL", - pactionItem->options); - - switch(pactionItem->command) { - case CMD_END: - end = 1; - break; - case CMD_COPY: - if (ExpandConfFile(hwnd, szInst, - pactionItem->in, - pactionItem->out, - replaceHttpd, - pactionItem->options) < 0) { - /* Error has already been reported to the user */ - return 0; - } - break; - case CMD_RM: { - char inFile[MAX_INPUT_LINE]; - - ap_snprintf(inFile, sizeof(inFile), "%s\\%s", szInst, pactionItem->in); - if (unlink(inFile) < 0 && !(pactionItem->options & OPT_SILENT)) { - MessageBox_error(hwnd, AP_WIN32ERROR, "Error during configuration", - MB_ICONHAND, - "Could not remove file %s", - inFile); - return 0; - } - LogMessage("RM: deleted file %s", inFile); - break; - } - case CMD_RMDIR: { - char inFile[MAX_INPUT_LINE]; - - ap_snprintf(inFile, sizeof(inFile), "%s\\%s", szInst, pactionItem->in); - if (rmdir(inFile) < 0) { - MessageBox_error(hwnd, AP_WIN32ERROR, "Error during configuration", - MB_ICONHAND, - "Could not delete temporary directory %s", - inFile); - return 0; - } - LogMessage("RMDIR: deleted directory %s", inFile); - break; - } - default: - MessageBox_error(hwnd, 0, "Error during configuration", - MB_ICONHAND, - "An error has occurred during configuration\r" - "(Error: unknown command %d)", (int)pactionItem->command); - end = 1; - break; - } - pactionItem++; - } - - LogMessage("FINISHED OK"); - CloseLog(); - - return 1; -} - - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - if (fdwReason == DLL_PROCESS_ATTACH) - hInstance = hInstDLL; - return TRUE; -} diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/install.def b/usr.sbin/httpd/src/os/win32/installer/installdll/install.def deleted file mode 100644 index aae6ded275d..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/install.def +++ /dev/null @@ -1,6 +0,0 @@ -LIBRARY INSTALL -DESCRIPTION 'Installer DLL For Apache' - -EXPORTS - BeforeExit @1 - DllMain @2 diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/install.dsp b/usr.sbin/httpd/src/os/win32/installer/installdll/install.dsp deleted file mode 100644 index b5cefde54d8..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/install.dsp +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="install" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=install - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "install.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "install.mak" CFG="install - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "install - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "install - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "install - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\include" /I "..\..\..\..\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /map /machine:I386 - -!ELSEIF "$(CFG)" == "install - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "install - Win32 Release" -# Name "install - Win32 Debug" -# Begin Source File - -SOURCE=..\..\..\..\ap\ap_snprintf.c -# End Source File -# Begin Source File - -SOURCE=.\install.c -# End Source File -# Begin Source File - -SOURCE=.\install.def -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/install.mak b/usr.sbin/httpd/src/os/win32/installer/installdll/install.mak deleted file mode 100644 index b3859557b9c..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/install.mak +++ /dev/null @@ -1,317 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on install.dsp -!IF "$(CFG)" == "" -CFG=install - Win32 Debug -!MESSAGE No configuration specified. Defaulting to install - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "install - Win32 Release" && "$(CFG)" !=\ - "install - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "install.mak" CFG="install - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "install - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "install - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "install - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\install.dll" - -!ELSE - -ALL : "$(OUTDIR)\install.dll" - -!ENDIF - -CLEAN : - -@erase "$(INTDIR)\ap_snprintf.obj" - -@erase "$(INTDIR)\install.obj" - -@erase "$(INTDIR)\vc50.idb" - -@erase "$(OUTDIR)\install.dll" - -@erase "$(OUTDIR)\install.exp" - -@erase "$(OUTDIR)\install.lib" - -@erase "$(OUTDIR)\install.map" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\..\..\..\include" /I\ - "..\..\..\..\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\\" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\install.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\install.pdb" /map:"$(INTDIR)\install.map"\ - /machine:I386 /def:".\install.def" /out:"$(OUTDIR)\install.dll"\ - /implib:"$(OUTDIR)\install.lib" -DEF_FILE= \ - ".\install.def" -LINK32_OBJS= \ - "$(INTDIR)\ap_snprintf.obj" \ - "$(INTDIR)\install.obj" - -"$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "install - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\install.dll" - -!ELSE - -ALL : "$(OUTDIR)\install.dll" - -!ENDIF - -CLEAN : - -@erase "$(INTDIR)\ap_snprintf.obj" - -@erase "$(INTDIR)\install.obj" - -@erase "$(INTDIR)\vc50.idb" - -@erase "$(INTDIR)\vc50.pdb" - -@erase "$(OUTDIR)\install.dll" - -@erase "$(OUTDIR)\install.exp" - -@erase "$(OUTDIR)\install.ilk" - -@erase "$(OUTDIR)\install.lib" - -@erase "$(OUTDIR)\install.map" - -@erase "$(OUTDIR)\install.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /D "WIN32"\ - /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\install.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll\ - /incremental:yes /pdb:"$(OUTDIR)\install.pdb" /map:"$(INTDIR)\install.map"\ - /debug /machine:I386 /def:".\install.def" /out:"$(OUTDIR)\install.dll"\ - /implib:"$(OUTDIR)\install.lib" /pdbtype:sept -DEF_FILE= \ - ".\install.def" -LINK32_OBJS= \ - "$(INTDIR)\ap_snprintf.obj" \ - "$(INTDIR)\install.obj" - -"$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - - -!IF "$(CFG)" == "install - Win32 Release" || "$(CFG)" ==\ - "install - Win32 Debug" -SOURCE=..\..\..\..\ap\ap_snprintf.c - -!IF "$(CFG)" == "install - Win32 Release" - -DEP_CPP_AP_SN=\ - "..\..\..\..\include\ap.h"\ - "..\..\..\..\include\ap_alloc.h"\ - "..\..\..\..\include\ap_config.h"\ - "..\..\..\..\include\ap_ctype.h"\ - "..\..\..\..\include\ap_mmn.h"\ - "..\..\..\..\include\buff.h"\ - "..\..\..\..\include\hsregex.h"\ - "..\..\..\..\include\httpd.h"\ - "..\..\..\..\include\util_uri.h"\ - "..\..\os.h"\ - "..\..\readdir.h"\ - -NODEP_CPP_AP_SN=\ - "..\..\..\..\include\ap_config_auto.h"\ - "..\..\..\..\include\ebcdic.h"\ - "..\..\..\..\include\sfio.h"\ - - -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "install - Win32 Debug" - -DEP_CPP_AP_SN=\ - "..\..\..\..\include\ap.h"\ - "..\..\..\..\include\ap_alloc.h"\ - "..\..\..\..\include\ap_config.h"\ - "..\..\..\..\include\ap_ctype.h"\ - "..\..\..\..\include\ap_mmn.h"\ - "..\..\..\..\include\buff.h"\ - "..\..\..\..\include\hsregex.h"\ - "..\..\..\..\include\httpd.h"\ - "..\..\..\..\include\util_uri.h"\ - "..\..\os.h"\ - "..\..\readdir.h"\ - -NODEP_CPP_AP_SN=\ - "..\..\..\..\include\ap_config_auto.h"\ - "..\..\..\..\include\ebcdic.h"\ - "..\..\..\..\include\os.h"\ - "..\..\..\..\include\sfio.h"\ - - -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -SOURCE=.\install.c - -!IF "$(CFG)" == "install - Win32 Release" - -DEP_CPP_INSTA=\ - "..\..\..\..\include\ap.h"\ - "..\..\..\..\include\ap_config.h"\ - "..\..\..\..\include\ap_ctype.h"\ - "..\..\..\..\include\ap_mmn.h"\ - "..\..\..\..\include\conf.h"\ - "..\..\..\..\include\hsregex.h"\ - "..\..\os.h"\ - -NODEP_CPP_INSTA=\ - "..\..\..\..\include\ap_config_auto.h"\ - - -"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "install - Win32 Debug" - -DEP_CPP_INSTA=\ - "..\..\..\..\include\ap.h"\ - "..\..\..\..\include\ap_config.h"\ - "..\..\..\..\include\ap_ctype.h"\ - "..\..\..\..\include\ap_mmn.h"\ - "..\..\..\..\include\conf.h"\ - "..\..\..\..\include\hsregex.h"\ - "..\..\os.h"\ - -NODEP_CPP_INSTA=\ - "..\..\..\..\include\ap_config_auto.h"\ - "..\..\..\..\include\os.h"\ - - -"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)" - - -!ENDIF - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/test/resource.h b/usr.sbin/httpd/src/os/win32/installer/installdll/test/resource.h deleted file mode 100644 index 6d1f9d8b4e5..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/test/resource.h +++ /dev/null @@ -1,26 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by test.rc -// -#define IDM_TEST 102 -#define IDI_TEST 106 -#define IDM_EXIT 106 -#define IDD_ABOUT 107 -#define IDD_SETDIRECTORY 109 -#define IDM_ABOUT 303 -#define IDC_DIRECTORY 1000 -#define IDM_BEFOREEXIT 40001 -#define IDM_CONFIGURE 40001 -#define IDC_STATIC -1 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 110 -#define _APS_NEXT_COMMAND_VALUE 40002 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.c b/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.c deleted file mode 100644 index 8a595094ba5..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.c +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Tester for the Apache Install DLL - */ - -#include <windows.h> -#include <direct.h> - -#include "test.h" - -#define APPNAME "Test" - -HINSTANCE hInst; // current instance -char szAppName[100]; // Name of the app -char szTitle[100]; // The title bar text - -// This is imported from the Apache INSTALL.DLL -extern CHAR WINAPI BeforeExit(HWND, LPSTR,LPSTR,LPSTR,LPSTR); - -BOOL InitApplication(HINSTANCE); -BOOL InitInstance(HINSTANCE, int); -BOOL CenterWindow (HWND hwndChild, HWND hwndParent); -LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK SetDirectory(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); - -char szInstDir[MAX_PATH]; - -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) -{ - MSG msg; - HANDLE hAccelTable; - - lstrcpy (szAppName, APPNAME); - lstrcpy (szTitle, APPNAME); - - getcwd(szInstDir, sizeof(szInstDir)); - - if (!hPrevInstance) { - if (!InitApplication(hInstance)) { - return (FALSE); - } - } - - if (!InitInstance(hInstance, nCmdShow)) { - return (FALSE); - } - - hAccelTable = LoadAccelerators (hInstance, szAppName); - - while (GetMessage(&msg, NULL, 0, 0)) { - if (!TranslateAccelerator (msg.hwnd, hAccelTable, &msg)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - - return (msg.wParam); - - lpCmdLine; // This will prevent 'unused formal parameter' warnings -} - -BOOL InitApplication(HINSTANCE hInstance) -{ - WNDCLASS wc; - HWND hwnd; - - hwnd = FindWindow (szAppName, szTitle); - - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = (WNDPROC)WndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon (hInstance, MAKEINTRESOURCE(IDI_TEST)); - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wc.lpszMenuName = MAKEINTRESOURCE(IDM_TEST); - wc.lpszClassName = szAppName; - - return RegisterClass(&wc); -} - -BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) -{ - HWND hWnd; - - hInst = hInstance; - - hWnd = CreateWindow(szAppName, szTitle, WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, // x - 0, // y - 400, // width - 100, // height - NULL, // parent - NULL, // menu - hInstance, // instance handle - NULL); - - if (!hWnd) { - return (FALSE); - } - - ShowWindow(hWnd, nCmdShow); - UpdateWindow(hWnd); - - return (TRUE); -} - -LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - int wmId, wmEvent; - - switch (message) { - - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - - switch (wmId) { - - case IDM_ABOUT: - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT), hWnd, (DLGPROC)About); - break; - - case IDM_CONFIGURE: - { - int rc; - - if (DialogBox(hInst, MAKEINTRESOURCE(IDD_SETDIRECTORY), hWnd, (DLGPROC)SetDirectory) == FALSE) - break; - rc = BeforeExit(hWnd, szInstDir, szInstDir, szInstDir, NULL); - if (rc == 1) { - MessageBox(hWnd, "Configuration successful", - "Configuration successful", - MB_OK); - } - break; - } - case IDM_EXIT: - DestroyWindow (hWnd); - break; - - default: - return (DefWindowProc(hWnd, message, wParam, lParam)); - } - break; - - case WM_DESTROY: - PostQuitMessage(0); - break; - - default: - return (DefWindowProc(hWnd, message, wParam, lParam)); - } - return (0); -} - -LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - - switch (message) { - case WM_INITDIALOG: - CenterWindow (hDlg, GetWindow (hDlg, GW_OWNER)); - return (TRUE); - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { - EndDialog(hDlg, TRUE); - return (TRUE); - } - break; - } - - return FALSE; -} - -LRESULT CALLBACK SetDirectory(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - - switch (message) { - case WM_INITDIALOG: - CenterWindow (hDlg, GetWindow (hDlg, GW_OWNER)); - - SetDlgItemText(hDlg, IDC_DIRECTORY, szInstDir); - //SetFocus(GetDlgItem(hDlg, IDC_DIRECTORY)); - return (TRUE); - - case WM_COMMAND: - switch(LOWORD(wParam)) { - case IDCANCEL: - EndDialog(hDlg, FALSE); - return TRUE; - case IDOK: - GetDlgItemText(hDlg, IDC_DIRECTORY, szInstDir, sizeof(szInstDir)); - EndDialog(hDlg, TRUE); - return TRUE; - } - break; - } - - return FALSE; -} - -// -// FUNCTION: CenterWindow(HWND, HWND) -// -// PURPOSE: Centers one window over another. -// -// COMMENTS: -// -// In this function, we save the instance handle in a global variable and -// create and display the main program window. -// -// This functionwill center one window over another ensuring that -// the placement of the window is within the 'working area', meaning -// that it is both within the display limits of the screen, and not -// obscured by the tray or other framing elements of the desktop. -BOOL CenterWindow (HWND hwndChild, HWND hwndParent) -{ - RECT rChild, rParent, rWorkArea; - int wChild, hChild, wParent, hParent; - int xNew, yNew; - BOOL bResult; - - // Get the Height and Width of the child window - GetWindowRect (hwndChild, &rChild); - wChild = rChild.right - rChild.left; - hChild = rChild.bottom - rChild.top; - - // Get the Height and Width of the parent window - GetWindowRect (hwndParent, &rParent); - wParent = rParent.right - rParent.left; - hParent = rParent.bottom - rParent.top; - - // Get the limits of the 'workarea' - bResult = SystemParametersInfo( - SPI_GETWORKAREA, // system parameter to query or set - sizeof(RECT), - &rWorkArea, - 0); - if (!bResult) { - rWorkArea.left = rWorkArea.top = 0; - rWorkArea.right = GetSystemMetrics(SM_CXSCREEN); - rWorkArea.bottom = GetSystemMetrics(SM_CYSCREEN); - } - - // Calculate new X position, then adjust for workarea - xNew = rParent.left + ((wParent - wChild) /2); - if (xNew < rWorkArea.left) { - xNew = rWorkArea.left; - } else if ((xNew+wChild) > rWorkArea.right) { - xNew = rWorkArea.right - wChild; - } - - // Calculate new Y position, then adjust for workarea - yNew = rParent.top + ((hParent - hChild) /2); - if (yNew < rWorkArea.top) { - yNew = rWorkArea.top; - } else if ((yNew+hChild) > rWorkArea.bottom) { - yNew = rWorkArea.bottom - hChild; - } - - // Set it, and return - return SetWindowPos (hwndChild, NULL, xNew, yNew, 0, 0, SWP_NOSIZE | SWP_NOZORDER); -} - diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.def b/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.def deleted file mode 100644 index 30ab5c666c9..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.def +++ /dev/null @@ -1,2 +0,0 @@ -NAME Test -DESCRIPTION 'Test Installer DLL' diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.dsp b/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.dsp deleted file mode 100644 index 8d0cfb2edc4..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.dsp +++ /dev/null @@ -1,122 +0,0 @@ -# Microsoft Developer Studio Project File - Name="test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "test.mak" CFG="test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "test - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 ..\Release\install.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ..\Debug\install.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "test - Win32 Release" -# Name "test - Win32 Debug" -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\test.c -# End Source File -# Begin Source File - -SOURCE=.\test.def -# End Source File -# Begin Source File - -SOURCE=.\test.h -# End Source File -# Begin Source File - -SOURCE=.\test.ico -# End Source File -# Begin Source File - -SOURCE=.\test.rc - -!IF "$(CFG)" == "test - Win32 Release" - -!ELSEIF "$(CFG)" == "test - Win32 Debug" - -!ENDIF - -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.h b/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.h deleted file mode 100644 index 93a871ff59f..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "resource.h" - - - diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.ico b/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.ico Binary files differdeleted file mode 100644 index 0011934f782..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.ico +++ /dev/null diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.mak b/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.mak deleted file mode 100644 index 43e5668e960..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.mak +++ /dev/null @@ -1,229 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on test.dsp -!IF "$(CFG)" == "" -CFG=test - Win32 Debug -!MESSAGE No configuration specified. Defaulting to test - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "test - Win32 Release" && "$(CFG)" != "test - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "test.mak" CFG="test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "test - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "test - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\test.exe" - -!ELSE - -ALL : "$(OUTDIR)\test.exe" - -!ENDIF - -CLEAN : - -@erase "$(INTDIR)\test.obj" - -@erase "$(INTDIR)\test.res" - -@erase "$(INTDIR)\vc50.idb" - -@erase "$(OUTDIR)\test.exe" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=bcc32.exe -CPP_PROJ=-s /ML -w-8057 -w-8008 -w-8066 /O2 -D"WIN32" -D"NDEBUG" -D"_WINDOWS"\ - /Fp"$(INTDIR)\test.pch" /YX -o"$(INTDIR)\\$&.obj" /c -CPP_OBJS=.\Release/ -CPP_SBRS=. - -.c.obj: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp.obj: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx.obj: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -RSC=rc.exe -RSC_PROJ=/l 0x809 /fo"$(INTDIR)\test.res" /d "NDEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\Release\install.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /incremental:no /pdb:"$(OUTDIR)\test.pdb" /machine:I386 /def:".\test.def"\ - /out:"$(OUTDIR)\test.exe" -DEF_FILE= \ - ".\test.def" -LINK32_OBJS= \ - "$(INTDIR)\test.obj" \ - "$(INTDIR)\test.res" - -"$(OUTDIR)\test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "test - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\test.exe" - -!ELSE - -ALL : "$(OUTDIR)\test.exe" - -!ENDIF - -CLEAN : - -@erase "$(INTDIR)\test.obj" - -@erase "$(INTDIR)\test.res" - -@erase "$(INTDIR)\vc50.idb" - -@erase "$(INTDIR)\vc50.pdb" - -@erase "$(OUTDIR)\test.exe" - -@erase "$(OUTDIR)\test.ilk" - -@erase "$(OUTDIR)\test.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=bcc32.exe -CPP_PROJ=-s /MLd -w-8057 -w-8008 -w-8066 /Gm -v /Od -D"WIN32" -D"_DEBUG" -D"_WINDOWS"\ - /Fp"$(INTDIR)\test.pch" /YX -o"$(INTDIR)\\$&.obj" /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. - -.c.obj: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp.obj: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx.obj: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -RSC=rc.exe -RSC_PROJ=/l 0x809 /fo"$(INTDIR)\test.res" /d "_DEBUG" -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\test.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\Debug\install.lib wsock32.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /incremental:yes /pdb:"$(OUTDIR)\test.pdb" /debug /machine:I386\ - /def:".\test.def" /out:"$(OUTDIR)\test.exe" /pdbtype:sept -DEF_FILE= \ - ".\test.def" -LINK32_OBJS= \ - "$(INTDIR)\test.obj" \ - "$(INTDIR)\test.res" - -"$(OUTDIR)\test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - - -!IF "$(CFG)" == "test - Win32 Release" || "$(CFG)" == "test - Win32 Debug" -SOURCE_1=.\test.c -DEP_CPP_TEST_=\ - ".\test.h"\ - - -"$(INTDIR)\test.obj" : $(SOURCE_0) $(DEP_CPP_TEST_) "$(INTDIR)" - - -SOURCE_1=.\test.rc -DEP_RSC_TEST_R=\ - ".\test.h"\ - ".\test.ico"\ - - -"$(INTDIR)\test.res" : $(SOURCE_0) $(DEP_RSC_TEST_R) "$(INTDIR)" - $(RSC) $(RSC_PROJ) $(SOURCE_0) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.rc b/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.rc deleted file mode 100644 index 45ef47efb94..00000000000 --- a/usr.sbin/httpd/src/os/win32/installer/installdll/test/test.rc +++ /dev/null @@ -1,155 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "test.h" -#include "winver.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.K.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_TEST ICON DISCARDABLE "test.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_TEST MENU DISCARDABLE -BEGIN - POPUP "&Configure" - BEGIN - MENUITEM "&Configure", IDM_CONFIGURE - MENUITEM "E&xit", IDM_EXIT - END - POPUP "&Help" - BEGIN - MENUITEM "&About", IDM_ABOUT - END -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""test.h""\r\n" - "#include ""winver.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUT DIALOG DISCARDABLE 0, 0, 186, 62 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,41,50,14 - LTEXT "Apache post-install configuration tester",IDC_STATIC,7, - 7,172,10,NOT WS_GROUP - LTEXT "Copyright 1999 The Apache Group",IDC_STATIC,7,21,172,9 -END - -IDD_SETDIRECTORY DIALOG DISCARDABLE 0, 0, 186, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configure Apache" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,39,42,50,14 - PUSHBUTTON "Cancel",IDCANCEL,95,42,50,14 - LTEXT "Directory where Apache was installled",IDC_STATIC,7,7, - 164,11 - EDITTEXT IDC_DIRECTORY,7,22,172,12,ES_AUTOHSCROLL -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 55 - END - - IDD_SETDIRECTORY, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 56 - END -END -#endif // APSTUDIO_INVOKED - -#endif // English (U.K.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/usr.sbin/httpd/src/os/win32/win32/ApacheOS.dsp b/usr.sbin/httpd/src/os/win32/win32/ApacheOS.dsp deleted file mode 100644 index 52fc9648299..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/ApacheOS.dsp +++ /dev/null @@ -1,87 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ApacheOS" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=ApacheOS - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ApacheOS.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ApacheOS.mak" CFG="ApacheOS - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ApacheOS - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "ApacheOS - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "ApacheOS - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "LibR" -# PROP BASE Intermediate_Dir "LibR" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "LibR" -# PROP Intermediate_Dir "LibR" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"LibR\ApacheOS" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "ApacheOS - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "LibD" -# PROP BASE Intermediate_Dir "LibD" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "LibD" -# PROP Intermediate_Dir "LibD" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"LibD\ApacheOS" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "ApacheOS - Win32 Release" -# Name "ApacheOS - Win32 Debug" -# Begin Source File - -SOURCE=.\os.c -# End Source File -# Begin Source File - -SOURCE=.\os.h -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/ApacheOS.mak b/usr.sbin/httpd/src/os/win32/win32/ApacheOS.mak deleted file mode 100644 index cdae43136ec..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/ApacheOS.mak +++ /dev/null @@ -1,167 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on ApacheOS.dsp -!IF "$(CFG)" == "" -CFG=ApacheOS - Win32 Debug -!MESSAGE No configuration specified. Defaulting to ApacheOS - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "ApacheOS - Win32 Release" && "$(CFG)" !=\ - "ApacheOS - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ApacheOS.mak" CFG="ApacheOS - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ApacheOS - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "ApacheOS - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe - -!IF "$(CFG)" == "ApacheOS - Win32 Release" - -OUTDIR=.\LibR -INTDIR=.\LibR -# Begin Custom Macros -OutDir=.\LibR -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\ApacheOS.lib" - -!ELSE - -ALL : "$(OUTDIR)\ApacheOS.lib" - -!ENDIF - -CLEAN : - -@erase "$(INTDIR)\ApacheOS.idb" - -@erase "$(INTDIR)\os.obj" - -@erase "$(OUTDIR)\ApacheOS.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -RSC=rc.exe -CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c -CPP_OBJS=.\LibR/ -CPP_SBRS=. -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" -LIB32_OBJS= \ - "$(INTDIR)\os.obj" - -"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ELSEIF "$(CFG)" == "ApacheOS - Win32 Debug" - -OUTDIR=.\LibD -INTDIR=.\LibD -# Begin Custom Macros -OutDir=.\LibD -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\ApacheOS.lib" - -!ELSE - -ALL : "$(OUTDIR)\ApacheOS.lib" - -!ENDIF - -CLEAN : - -@erase "$(INTDIR)\ApacheOS.idb" - -@erase "$(INTDIR)\ApacheOS.pdb" - -@erase "$(INTDIR)\os.obj" - -@erase "$(OUTDIR)\ApacheOS.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -RSC=rc.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c -CPP_OBJS=.\LibD/ -CPP_SBRS=. -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" -BSC32_SBRS= \ - -LIB32=link.exe -lib -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" -LIB32_OBJS= \ - "$(INTDIR)\os.obj" - -"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) - $(LIB32) @<< - $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "ApacheOS - Win32 Release" || "$(CFG)" ==\ - "ApacheOS - Win32 Debug" -SOURCE=.\os.c -DEP_CPP_OS_C0=\ - ".\os.h"\ - - -"$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C0) "$(INTDIR)" - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/BaseAddr.ref b/usr.sbin/httpd/src/os/win32/win32/BaseAddr.ref deleted file mode 100644 index ec90ed4cd68..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/BaseAddr.ref +++ /dev/null @@ -1,28 +0,0 @@ -; os/win32/BaseAddr.ref contains the central repository -; of all module base addresses -; to avoid relocation - -; WARNING: Update this file by reviewing the image size -; of the debug-generated dll files; release images -; should fit in the larger debug-sized reservations. -; Always allow some slack (if >C000, size at 20000) -; to allow for discrepancies between builds. - -; module name base-address max-size - -ApacheCore 0x6FF60000 0x000A0000 -xmlparse 0x6FF40000 0x00020000 -xmltok 0x6FF10000 0x00030000 -mod_auth_anon 0x6FEF0000 0x00010000 -mod_auth_digest 0x6FED0000 0x00020000 -mod_cern_meta 0x6FEC0000 0x00010000 -mod_digest 0x6FEB0000 0x00010000 -mod_expires 0x6FEA0000 0x00010000 -mod_headers 0x6FE90000 0x00010000 -mod_info 0x6FE80000 0x00010000 -mod_rewrite 0x6FE60000 0x00020000 -mod_speling 0x6FE50000 0x00010000 -mod_status 0x6FE40000 0x00010000 -mod_usertrack 0x6FE30000 0x00010000 -mod_proxy 0x6FE10000 0x00020000 -mod_auth_dbm 0x6FE00000 0x00010000 diff --git a/usr.sbin/httpd/src/os/win32/win32/MakeModuleMak.cpp b/usr.sbin/httpd/src/os/win32/win32/MakeModuleMak.cpp deleted file mode 100644 index 9ab9f272217..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/MakeModuleMak.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include <fstream.h> -#include <assert.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> - -void MakeMake(const char *szModule,const char *szSource) - { - ifstream ifs("Module.mak.tmpl",ios::nocreate); - assert(ifs.good()); - - char buf[1024]; - sprintf(buf,"%s.mak",szModule); - ofstream ofs(buf,ios::trunc); - for( ; ; ) - { - ifs.getline(buf,sizeof buf); - if(ifs.eof()) - break; - for(char *s=buf ; *s ; ) - { - char *p=strchr(s,'%'); - if(!p) - { - ofs << s << '\n'; - break; - } - if(!strncmp(p,"%Module%",8)) - { - ofs.write(s,p-s); - ofs << szModule; - s=p+8; - } - else if(!strncmp(p,"%Source%",8)) - { - ofs.write(s,p-s); - ofs << szSource; - s=p+8; - } - else - { - ofs.write(s,p-s+1); - s=p+1; - } - } - } - } - -void main(int argc,char **argv) - { - if(argc < 2 || (argc%2) != 1) - { - cerr << argv[0] << " [<module name> <source file>]+\n"; - exit(1); - } - for(int n=1 ; n < argc ; n+=2) - MakeMake(argv[n],argv[n+1]); - } - diff --git a/usr.sbin/httpd/src/os/win32/win32/Module.mak.tmpl b/usr.sbin/httpd/src/os/win32/win32/Module.mak.tmpl deleted file mode 100644 index 4f6f2e1be9c..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/Module.mak.tmpl +++ /dev/null @@ -1,230 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -!IF "$(CFG)" == "" -CFG=%Module% - Win32 Debug -!MESSAGE No configuration specified. Defaulting to %Module% - Win32\ - Debug. -!ENDIF - -!IF "$(CFG)" != "%Module% - Win32 Release" && "$(CFG)" !=\ - "%Module% - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE on this makefile -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "%Module%.mak"\ - CFG="%Module% - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "%Module% - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "%Module% - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF -################################################################################ -# Begin Project -# PROP Target_Last_Scanned "%Module% - Win32 Debug" -MTL=mktyplib.exe -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "%Module% - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "%Module%R" -# PROP Intermediate_Dir "%Module%R" -# PROP Target_Dir "" -OUTDIR=.\%Module%R -INTDIR=.\%Module%R - -ALL : "$(OUTDIR)\%Module%.dll" - -CLEAN : - -@erase "$(INTDIR)\%Source%.obj" - -@erase "$(OUTDIR)\%Module%.dll" - -@erase "$(OUTDIR)\%Module%.exp" - -@erase "$(OUTDIR)\%Module%.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\ - "_WINDOWS" /Fp"$(INTDIR)/%Module%.pch" /YX /Fo"$(INTDIR)/" /c -CPP_OBJS=.\%Module%R/ -CPP_SBRS=.\. -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /win32 -MTL_PROJ=/nologo /D "NDEBUG" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/%Module%.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ - uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)/%Module%.pdb" /machine:I386\ - /out:"$(OUTDIR)/%Module%.dll"\ - /implib:"$(OUTDIR)/%Module%.lib" -LINK32_OBJS= \ - "$(INTDIR)\%Source%.obj" - -"$(OUTDIR)\%Module%.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "%Module% - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "%Module%D" -# PROP Intermediate_Dir "%Module%D" -# PROP Target_Dir "" -OUTDIR=.\%Module%D -INTDIR=.\%Module%D - -ALL : "$(OUTDIR)\%Module%.dll" - -CLEAN : - -@erase "$(INTDIR)\%Source%.obj" - -@erase "$(INTDIR)\vc40.idb" - -@erase "$(INTDIR)\vc40.pdb" - -@erase "$(OUTDIR)\%Module%.dll" - -@erase "$(OUTDIR)\%Module%.exp" - -@erase "$(OUTDIR)\%Module%.ilk" - -@erase "$(OUTDIR)\%Module%.lib" - -@erase "$(OUTDIR)\%Module%.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D "_DEBUG"\ - /D "_WINDOWS" /Fp"$(INTDIR)/%Module%.pch" /YX /Fo"$(INTDIR)/"\ - /Fd"$(INTDIR)/" /c -CPP_OBJS=.\%Module%D/ -CPP_SBRS=.\. -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /win32 -MTL_PROJ=/nologo /D "_DEBUG" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/%Module%.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ - uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\ - /incremental:yes /pdb:"$(OUTDIR)/%Module%.pdb" /debug /machine:I386\ - /out:"$(OUTDIR)/%Module%.dll"\ - /implib:"$(OUTDIR)/%Module%.lib" -LINK32_OBJS= \ - "$(INTDIR)\%Source%.obj" - -"$(OUTDIR)\%Module%.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.cpp{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.cxx{$(CPP_OBJS)}.obj: - $(CPP) $(CPP_PROJ) $< - -.c{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -.cpp{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -.cxx{$(CPP_SBRS)}.sbr: - $(CPP) $(CPP_PROJ) $< - -################################################################################ -# Begin Target - -# Name "%Module% - Win32 Release" -# Name "%Module% - Win32 Debug" - -!IF "$(CFG)" == "%Module% - Win32 Release" - -!ELSEIF "$(CFG)" == "%Module% - Win32 Debug" - -!ENDIF - -################################################################################ -# Begin Source File - -SOURCE=\work\apache\src\%Source%.c -DEP_CPP_MOD_A=\ - "..\ap_alloc.h"\ - "..\buff.h"\ - "..\conf.h"\ - "..\http_config.h"\ - "..\http_core.h"\ - "..\http_log.h"\ - "..\http_request.h"\ - "..\httpd.h"\ - "..\regex\regex.h"\ - "..\ap_mmn.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"\sys\stat.h"\ - {$(INCLUDE)}"\sys\types.h"\ - -NODEP_CPP_MOD_A=\ - "..\sfio.h"\ - - -"$(INTDIR)\%Source%.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -# End Source File -# End Target -# End Project -################################################################################ diff --git a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.c b/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.c deleted file mode 100644 index a285329b43e..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.c +++ /dev/null @@ -1,739 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifdef WIN32 - -/* - * Win9xConHook.dll - a hook proc to clean up Win95/98 console behavior. - * - * It is well(?) documented by Microsoft that the Win9x HandlerRoutine - * hooked by the SetConsoleCtrlHandler never receives the CTRL_CLOSE_EVENT, - * CTRL_LOGOFF_EVENT or CTRL_SHUTDOWN_EVENT signals. - * - * It is possible to have a second window to monitor the WM_ENDSESSION - * message, but the close button still fails.. - * - * There is a 16bit polling method for the close window option, but this - * is CPU intensive and requires thunking. - * - * Attempts to subclass the 'tty' console fail, since that message thread - * is actually owned by the 16 bit winoldap.mod process, although the - * window reports it is owned by the process/thread of the console app. - * - * Win9xConHook is thunks the WM_CLOSE and WM_ENDSESSION messages, - * first through a window hook procedure in the winoldap context, into - * a subclass WndProc, and on to a second hidden monitor window in the - * console application's context that dispatches them to the console app's - * registered HandlerRoutine. - */ - -/* This debugging define turns on output to COM1, although you better init - * the port first (even using hyperterm). It's the only way to catch the - * goings on within system logoff/shutdown. - * #define DBG 1 - */ - -#include <windows.h> - -/* Variables used within any process context: - * hookwndmsg is a shared message to send Win9xConHook signals - * origwndprop is a wndprop atom to store the orig wndproc of the tty - * hookwndprop is a wndprop atom to store the hwnd of the hidden child - * is_service reminds us to unmark this process on the way out - */ -static UINT hookwndmsg = 0; -static LPCTSTR origwndprop; -static LPCTSTR hookwndprop; -static BOOL is_service = 0; -//static HMODULE hmodThis = NULL; - -/* Variables used within the tty processes' context: - * is_tty flags this process; -1 == unknown, 1 == if tty, 0 == if not - * hw_tty is the handle of the top level tty in this process context - * is_subclassed is toggled to assure DllMain removes the subclass on unload - * hmodLock is there to try and prevent this dll from being unloaded if the - * hook is removed while we are subclassed - */ -static int is_tty = -1; -static HWND hwtty = NULL; -static BOOL is_subclassed = 0; - -// This simply causes a gpfault the moment it tries to FreeLibrary within -// the subclass procedure ... not good. -//static HMODULE hmodLock = NULL; - -/* Variables used within the service or console app's context: - * hmodHook is the instance handle of this module for registering the hooks - * hhkGetMessage is the hook handle for catching Posted messages - * hhkGetMessage is the hook handle for catching Sent messages - * monitor_hwnd is the invisible window that handles our tty messages - * the tty_info strucure is used to pass args into the hidden window's thread - */ -static HMODULE hmodHook = NULL; -static HHOOK hhkGetMessage; -//static HHOOK hhkCallWndProc; -static HWND monitor_hwnd = NULL; - -typedef struct { - PHANDLER_ROUTINE phandler; - HINSTANCE instance; - HWND parent; - INT type; - LPCSTR name; -} tty_info; - -/* These are the GetWindowLong offsets for the hidden window's internal info - * gwltty_phandler is the address of the app's HandlerRoutine - * gwltty_ttywnd is the tty this hidden window will handle messages from - */ -#define gwltty_phandler 0 -#define gwltty_ttywnd 4 - -/* Forward declaration prototypes for internal functions - */ -static BOOL CALLBACK EnumttyWindow(HWND wnd, LPARAM retwnd); -static LRESULT WINAPI RegisterWindows9xService(BOOL set_service); -static LRESULT CALLBACK ttyConsoleCtrlWndProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam); -static DWORD WINAPI ttyConsoleCtrlThread(LPVOID tty); -static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam); -static int HookProc(int hc, HWND *hwnd, UINT *msg, - WPARAM *wParam, LPARAM *lParam); -#ifdef DBG -static VOID DbgPrintf(LPTSTR fmt, ...); -#endif - - -/* DllMain is invoked by every process in the entire system that is hooked - * by our window hooks, notably the tty processes' context, and by the user - * who wants tty messages (the app). Keep it light and simple. - */ -BOOL __declspec(dllexport) APIENTRY DllMain(HINSTANCE hModule, ULONG ulReason, - LPVOID pctx) -{ - if (ulReason == DLL_PROCESS_ATTACH) - { - //hmodThis = hModule; - if (!hookwndmsg) { - origwndprop = MAKEINTATOM(GlobalAddAtom("Win9xConHookOrigProc")); - hookwndprop = MAKEINTATOM(GlobalAddAtom("Win9xConHookThunkWnd")); - hookwndmsg = RegisterWindowMessage("Win9xConHookMsg"); - } -#ifdef DBG -// DbgPrintf("H ProcessAttach:%8.8x\r\n", -// GetCurrentProcessId()); -#endif - } - else if ( ulReason == DLL_PROCESS_DETACH ) - { -#ifdef DBG -// DbgPrintf("H ProcessDetach:%8.8x\r\n", GetCurrentProcessId()); -#endif - if (monitor_hwnd) - SendMessage(monitor_hwnd, WM_DESTROY, 0, 0); - if (is_subclassed) - SendMessage(hwtty, hookwndmsg, 0, (LPARAM)hwtty); - if (hmodHook) - { - if (hhkGetMessage) { - UnhookWindowsHookEx(hhkGetMessage); - hhkGetMessage = NULL; - } - //if (hhkCallWndProc) { - // UnhookWindowsHookEx(hhkCallWndProc); - // hhkCallWndProc = NULL; - //} - FreeLibrary(hmodHook); - hmodHook = NULL; - } - if (is_service) - RegisterWindows9xService(FALSE); - if (hookwndmsg) { - GlobalDeleteAtom((ATOM)origwndprop); - GlobalDeleteAtom((ATOM)hookwndprop); - hookwndmsg = 0; - } - } - return TRUE; -} - - -/* This group of functions are provided for the service/console app - * to register itself a HandlerRoutine to accept tty or service messages - */ - - -/* Exported function that creates a Win9x 'service' via a hidden window, - * that notifies the process via the HandlerRoutine messages. - */ -BOOL __declspec(dllexport) WINAPI Windows9xServiceCtrlHandler( - PHANDLER_ROUTINE phandler, - LPCSTR name) -{ - /* If we have not yet done so */ - FreeConsole(); - - if (name) - { - DWORD tid; - HANDLE hThread; - /* NOTE: this is static so the module can continue to - * access these args while we go on to other things - */ - static tty_info tty; - tty.instance = GetModuleHandle(NULL); - tty.phandler = phandler; - tty.parent = NULL; - tty.name = name; - tty.type = 2; - RegisterWindows9xService(TRUE); - hThread = CreateThread(NULL, 0, ttyConsoleCtrlThread, - (LPVOID)&tty, 0, &tid); - if (hThread) - { - CloseHandle(hThread); - return TRUE; - } - } - else /* remove */ - { - if (monitor_hwnd) - SendMessage(monitor_hwnd, WM_DESTROY, 0, 0); - RegisterWindows9xService(FALSE); - return TRUE; - } - return FALSE; -} - - -/* Exported function that registers a HandlerRoutine to accept missing - * Win9x CTRL_EVENTs from the tty window, as NT does without a hassle. - * If add is 1 or 2, register the handler, if 2 also mark it as a service. - * If add is 0 deregister the handler, and unmark if a service - */ -BOOL __declspec(dllexport) WINAPI FixConsoleCtrlHandler( - PHANDLER_ROUTINE phandler, - INT add) -{ - HWND parent; - - if (add) - { - HANDLE hThread; - DWORD tid; - /* NOTE: this is static so the module can continue to - * access these args while we go on to other things - */ - static tty_info tty; - EnumWindows(EnumttyWindow, (LPARAM)&parent); - if (!parent) { -#ifdef DBG - DbgPrintf("A EnumttyWindow failed (%d)\r\n", GetLastError()); -#endif - return FALSE; - } - tty.instance = GetModuleHandle(NULL); - tty.phandler = phandler; - tty.parent = parent; - tty.type = add; - if (add == 2) { - tty.name = "ttyService"; - RegisterWindows9xService(TRUE); - } - else - tty.name = "ttyMonitor"; - hThread = CreateThread(NULL, 0, ttyConsoleCtrlThread, - (LPVOID)&tty, 0, &tid); - if (!hThread) - return FALSE; - CloseHandle(hThread); - hmodHook = LoadLibrary("Win9xConHook.dll"); - if (hmodHook) - { - hhkGetMessage = SetWindowsHookEx(WH_GETMESSAGE, - (HOOKPROC)GetProcAddress(hmodHook, "GetMsgProc"), hmodHook, 0); - //hhkCallWndProc = SetWindowsHookEx(WH_CALLWNDPROC, - // (HOOKPROC)GetProcAddress(hmodHook, "CallWndProc"), hmodHook, 0); - } - return TRUE; - } - else /* remove */ - { - if (monitor_hwnd) { - SendMessage(monitor_hwnd, WM_DESTROY, 0, 0); - } - if (hmodHook) - { - if (hhkGetMessage) { - UnhookWindowsHookEx(hhkGetMessage); - hhkGetMessage = NULL; - } - //if (hhkCallWndProc) { - // UnhookWindowsHookEx(hhkCallWndProc); - // hhkCallWndProc = NULL; - //} - FreeLibrary(hmodHook); - hmodHook = NULL; - } - if (is_service) - RegisterWindows9xService(FALSE); - return TRUE; - } - return FALSE; -} - - -/* The following internal helpers are only used within the app's context - */ - -/* ttyConsoleCreateThread is the process that runs within the user app's - * context. It creates and pumps the messages of a hidden monitor window, - * watching for messages from the system, or the associated subclassed tty - * window. Things can happen in our context that can't be done from the - * tty's context, and visa versa, so the subclass procedure and this hidden - * window work together to make it all happen. - */ -static DWORD WINAPI ttyConsoleCtrlThread(LPVOID tty) -{ - WNDCLASS wc; - MSG msg; - wc.style = CS_GLOBALCLASS; - wc.lpfnWndProc = ttyConsoleCtrlWndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 8; - wc.hInstance = NULL; - wc.hIcon = NULL; - wc.hCursor = NULL; - wc.hbrBackground = NULL; - wc.lpszMenuName = NULL; - if (((tty_info*)tty)->parent) - wc.lpszClassName = "ttyConHookChild"; - else - wc.lpszClassName = "ApacheWin95ServiceMonitor"; - - if (!RegisterClass(&wc)) { -#ifdef DBG - DbgPrintf("A proc %8.8x Error creating class %s (%d)\r\n", - GetCurrentProcessId(), wc.lpszClassName, GetLastError()); -#endif - return 0; - } - - /* Create an invisible window */ - monitor_hwnd = CreateWindow(wc.lpszClassName, ((tty_info*)tty)->name, - WS_OVERLAPPED & ~WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, - ((tty_info*)tty)->instance, tty); - - if (!monitor_hwnd) { -#ifdef DBG - DbgPrintf("A proc %8.8x Error creating window %s %s (%d)\r\n", - GetCurrentProcessId(), wc.lpszClassName, - ((tty_info*)tty)->name, GetLastError()); -#endif - return 0; - } - - while (GetMessage(&msg, NULL, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - /* Tag again as deleted, just in case we missed WM_DESTROY */ - monitor_hwnd = NULL; - return 0; -} - - -/* This is the WndProc procedure for our invisible window. - * When our subclasssed tty window receives the WM_CLOSE, WM_ENDSESSION, - * or WM_QUERYENDSESSION messages, the message is dispatched to our hidden - * window (this message process), and we call the installed HandlerRoutine - * that was registered by the app. - */ -static LRESULT CALLBACK ttyConsoleCtrlWndProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam) -{ - if (msg == WM_CREATE) - { - tty_info *tty = (tty_info*)(((LPCREATESTRUCT)lParam)->lpCreateParams); - SetWindowLong(hwnd, gwltty_phandler, (LONG)tty->phandler); - SetWindowLong(hwnd, gwltty_ttywnd, (LONG)tty->parent); -#ifdef DBG - DbgPrintf("A proc %8.8x created %8.8x %s for tty wnd %8.8x\r\n", - GetCurrentProcessId(), hwnd, - tty->name, tty->parent); -#endif - if (tty->parent) { - SetProp(tty->parent, hookwndprop, hwnd); - PostMessage(tty->parent, hookwndmsg, - tty->type, (LPARAM)tty->parent); - } - return 0; - } - else if (msg == WM_DESTROY) - { - HWND parent = (HWND)GetWindowLong(hwnd, gwltty_ttywnd); -#ifdef DBG - DbgPrintf("A proc %8.8x destroyed %8.8x ttyConHookChild\r\n", - GetCurrentProcessId(), hwnd); -#endif - if (parent) { - RemoveProp(parent, hookwndprop); - SendMessage(parent, hookwndmsg, 0, (LPARAM)parent); - } - monitor_hwnd = NULL; - } - else if (msg == WM_CLOSE) - { - PHANDLER_ROUTINE phandler = - (PHANDLER_ROUTINE)GetWindowLong(hwnd, gwltty_phandler); - LRESULT rv = phandler(CTRL_CLOSE_EVENT); -#ifdef DBG - DbgPrintf("A proc %8.8x invoked CTRL_CLOSE_EVENT " - "returning %d\r\n", - GetCurrentProcessId(), rv); -#endif - if (rv) - return !rv; - } - else if ((msg == WM_QUERYENDSESSION) || (msg == WM_ENDSESSION)) - { - if (lParam & ENDSESSION_LOGOFF) - { - PHANDLER_ROUTINE phandler = - (PHANDLER_ROUTINE)GetWindowLong(hwnd, gwltty_phandler); - LRESULT rv = phandler(CTRL_LOGOFF_EVENT); -#ifdef DBG - DbgPrintf("A proc %8.8x invoked CTRL_LOGOFF_EVENT " - "returning %d\r\n", - GetCurrentProcessId(), rv); -#endif - if (rv) - return ((msg == WM_QUERYENDSESSION) ? rv : !rv); - } - else - { - PHANDLER_ROUTINE phandler = - (PHANDLER_ROUTINE)GetWindowLong(hwnd, gwltty_phandler); - LRESULT rv = phandler(CTRL_SHUTDOWN_EVENT); -#ifdef DBG - DbgPrintf("A proc %8.8x invoked CTRL_SHUTDOWN_EVENT " - "returning %d\r\n", GetCurrentProcessId(), rv); -#endif - if (rv) - return ((msg == WM_QUERYENDSESSION) ? rv : !rv); - } - } - return (DefWindowProc(hwnd, msg, wParam, lParam)); -} - - -/* The following internal helpers are invoked by the hooked tty and our app - */ - - -/* Register or deregister the current process as a Windows9x style service. - * Experience shows this call is ignored across processes, so the second - * arg to RegisterServiceProcess (process group id) is effectively useless. - */ -static LRESULT WINAPI RegisterWindows9xService(BOOL set_service) -{ - static HINSTANCE hkernel; - static DWORD (WINAPI *register_service_process)(DWORD, DWORD) = NULL; - BOOL rv; - - if (set_service == is_service) - return 1; - -#ifdef DBG - DbgPrintf("R %s proc %8.8x as a service\r\n", - set_service ? "installing" : "removing", - GetCurrentProcessId()); -#endif - - if (!register_service_process) - { - /* Obtain a handle to the kernel library */ - hkernel = LoadLibrary("KERNEL32.DLL"); - if (!hkernel) - return 0; - - /* Find the RegisterServiceProcess function */ - register_service_process = (DWORD (WINAPI *)(DWORD, DWORD)) - GetProcAddress(hkernel, "RegisterServiceProcess"); - if (register_service_process == NULL) { - FreeLibrary(hkernel); - return 0; - } - } - - /* Register this process as a service */ - rv = register_service_process(0, set_service != FALSE); - if (rv) - is_service = set_service; - - if (!is_service) - { - /* Unload the kernel library */ - FreeLibrary(hkernel); - register_service_process = NULL; - } - return rv; -} - - -/* - * This function only works when this process is the active process - * (e.g. once it is running a child process, it can no longer determine - * which console window is its own.) - */ -static BOOL CALLBACK EnumttyWindow(HWND wnd, LPARAM retwnd) -{ - char tmp[8]; - if (GetClassName(wnd, tmp, sizeof(tmp)) && !strcmp(tmp, "tty")) - { - DWORD wndproc, thisproc = GetCurrentProcessId(); - GetWindowThreadProcessId(wnd, &wndproc); - if (wndproc == thisproc) { - *((HWND*)retwnd) = wnd; - return FALSE; - } - } - return TRUE; -} - - -/* The remaining code all executes --in the tty's own process context-- - * - * That means special attention must be paid to what it's doing... - */ - -/* Subclass message process for the tty window - * - * This code -handles- WM_CLOSE, WM_ENDSESSION and WM_QUERYENDSESSION - * by dispatching them to the window identified by the hookwndprop - * property atom set against our window. Messages are then dispatched - * to origwndprop property atom we set against the window when we - * injected this subclass. This trick did not work with simply a hook. - */ -static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam) -{ - WNDPROC origproc = (WNDPROC) GetProp(hwnd, origwndprop); - if (!origproc) - return 0; - - if (msg == WM_NCDESTROY - || (msg == hookwndmsg && !LOWORD(wParam) && (HWND)lParam == hwnd)) - { - if (is_subclassed) { -#ifdef DBG - DbgPrintf("W proc %08x hwnd:%08x Subclass removed\r\n", - GetCurrentProcessId(), hwnd); -#endif - if (is_service) - RegisterWindows9xService(FALSE); - SetWindowLong(hwnd, GWL_WNDPROC, (LONG)origproc); - RemoveProp(hwnd, origwndprop); - RemoveProp(hwnd, hookwndprop); - is_subclassed = FALSE; - //if (hmodLock) - // FreeLibrary(hmodLock); - //hmodLock = NULL; - } - } - else if (msg == WM_CLOSE || msg == WM_ENDSESSION - || msg == WM_QUERYENDSESSION) - { - HWND child = (HWND)GetProp(hwnd, hookwndprop); - if (child) { -#ifdef DBG - DbgPrintf("W proc %08x hwnd:%08x forwarded msg:%d\r\n", - GetCurrentProcessId(), hwnd, msg); -#endif - return SendMessage(child, msg, wParam, lParam); - } - } - return CallWindowProc(origproc, hwnd, msg, wParam, lParam); -} - - -/* HookProc, once installed, is responsible for subclassing the system - * tty windows. It generally does nothing special itself, since - * research indicates that it cannot deal well with the messages we are - * interested in, that is, WM_CLOSE, WM_QUERYSHUTDOWN and WM_SHUTDOWN - * of the tty process. - * - * Respond and subclass only when a WM_NULL is received by the window. - */ -int HookProc(int hc, HWND *hwnd, UINT *msg, WPARAM *wParam, LPARAM *lParam) -{ - if (is_tty == -1 && *hwnd) - { - char ttybuf[8]; - HWND htty; - hwtty = *hwnd; - while (htty = GetParent(hwtty)) - hwtty = htty; - is_tty = (GetClassName(hwtty, ttybuf, sizeof(ttybuf)) - && !strcmp(ttybuf, "tty")); -#ifdef DBG - if (is_tty) - DbgPrintf("H proc %08x tracking hwnd %08x\r\n", - GetCurrentProcessId(), hwtty); -#endif - } - - if (*msg == hookwndmsg && *wParam && *lParam == (LPARAM)hwtty && is_tty) - { - WNDPROC origproc = (WNDPROC)GetWindowLong(hwtty, GWL_WNDPROC); - //char myname[MAX_PATH]; - //if (GetModuleFileName(hmodThis, myname, sizeof(myname))) - // hmodLock = LoadLibrary(myname); - SetProp(hwtty, origwndprop, origproc); - SetWindowLong(hwtty, GWL_WNDPROC, (LONG)WndProc); - is_subclassed = TRUE; -#ifdef DBG - DbgPrintf("H proc %08x hwnd:%08x Subclassed\r\n", - GetCurrentProcessId(), hwtty); -#endif - if (LOWORD(*wParam) == 2) - RegisterWindows9xService(TRUE); - } - - return -1; -} - - -/* - * PostMessage Hook: - */ -LRESULT __declspec(dllexport) CALLBACK GetMsgProc(INT hc, WPARAM wParam, - LPARAM lParam) -{ - PMSG pmsg; - - pmsg = (PMSG)lParam; - - if (pmsg) { - int rv = HookProc(hc, &pmsg->hwnd, &pmsg->message, - &pmsg->wParam, &pmsg->lParam); - if (rv != -1) - return rv; - } - /* - * CallNextHookEx apparently ignores the hhook argument, so pass NULL - */ - return CallNextHookEx(NULL, hc, wParam, lParam); -} - - -/* - * SendMessage Hook: - */ -LRESULT __declspec(dllexport) CALLBACK CallWndProc(INT hc, WPARAM wParam, - LPARAM lParam) -{ - PCWPSTRUCT pcwps = (PCWPSTRUCT)lParam; - - if (pcwps) { - int rv = HookProc(hc, &pcwps->hwnd, &pcwps->message, - &pcwps->wParam, &pcwps->lParam); - if (rv != -1) - return rv; - } - /* - * CallNextHookEx apparently ignores the hhook argument, so pass NULL - */ - return CallNextHookEx(NULL, hc, wParam, lParam); -} - - -#ifdef DBG -VOID DbgPrintf( - LPTSTR fmt, - ... - ) -{ - static HANDLE mutex; - va_list marker; - TCHAR szBuf[256]; - DWORD t; - HANDLE gDbgOut; - - va_start(marker, fmt); - wvsprintf(szBuf, fmt, marker); - va_end(marker); - - if (!mutex) - mutex = CreateMutex(NULL, FALSE, "Win9xConHookDbgOut"); - WaitForSingleObject(mutex, INFINITE); - gDbgOut = CreateFile("COM1", GENERIC_READ | GENERIC_WRITE, 0, - NULL, OPEN_EXISTING, FILE_FLAG_WRITE_THROUGH, NULL); - WriteFile(gDbgOut, szBuf, strlen(szBuf), &t, NULL); - CloseHandle(gDbgOut); - ReleaseMutex(mutex); -} -#endif - -#endif /* WIN32 */ diff --git a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.def b/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.def deleted file mode 100644 index 85ec166404e..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.def +++ /dev/null @@ -1,10 +0,0 @@ -LIBRARY Win9xConHook - -EXETYPE WINDOWS - -EXPORTS - DllMain - GetMsgProc - CallWndProc - FixConsoleCtrlHandler - Windows9xServiceCtrlHandler diff --git a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.dsp b/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.dsp deleted file mode 100644 index 56ad1180a9d..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.dsp +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Win9xConHook" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=Win9xConHook - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Win9xConHook.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Win9xConHook.mak" CFG="Win9xConHook - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Win9xConHook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Win9xConHook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Win9xConHook - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\Release" -# PROP BASE Intermediate_Dir ".\Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\Win9xConHook" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /base:"0x1c0f0000" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /base:"0x1c0f0000" - -!ELSEIF "$(CFG)" == "Win9xConHook - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\Win9xConHook" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:"0x1c0f0000" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:"0x1c0f0000" - -!ENDIF - -# Begin Target - -# Name "Win9xConHook - Win32 Release" -# Name "Win9xConHook - Win32 Debug" -# Begin Source File - -SOURCE=.\Win9xConHook.c -# End Source File -# Begin Source File - -SOURCE=.\Win9xConHook.def -# End Source File -# Begin Source File - -SOURCE=.\Win9xConHook.h -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.h b/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.h deleted file mode 100644 index 312e82cd2de..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.h +++ /dev/null @@ -1,99 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifndef AP_WIN9XCONHOOK_H -#define AP_WIN9XCONHOOK_H - -#ifdef WIN32 - -/* Windows9xServiceCtrlHandler registers a handler routine, frees the - * console window, and registers this process as a service in Win9x. - * It creats a hidden window of class "ApacheWin95ServiceMonitor" - * and titled by the name passed, which passes the WM_SHUTDOWN message - * through the given HandlerRoutine's CTRL_SHUTDOWN event. - * Call with name of NULL to remove the Service handler. - */ -BOOL WINAPI Windows9xServiceCtrlHandler(PHANDLER_ROUTINE phandler, LPCSTR name); - - -/* FixConsoleControlHandler registers a handler routine with the - * Win9xConHook.dll, creating a hidden window and forwarding the - * WM_ENDSESSION and WM_CLOSE messages to the given HandlerRoutine - * as CTRL_SHUTDOWN_EVENT, CTRL_LOGOFF_EVENT and CTRL_CLOSE_EVENT. - * The application should still use SetConsoleCtrlHandler to grab - * the CTRL_BREAK_EVENT and CTRL_C_EVENT, if desired. - */ -BOOL WINAPI FixConsoleCtrlHandler(PHANDLER_ROUTINE phandler, BOOL add); - - -/* - * Exported PostMessage Hook, never use this directly: - * - * LRESULT CALLBACK GetMsgProc(INT hc, WPARAM wParam, LPARAM lParam); - */ - - -/* - * Exported SendMessage Hook, never use this directly: - * - * LRESULT CALLBACK CallWndProc(INT hc, WPARAM wParam, LPARAM lParam); - */ - -#endif /* WIN32 */ - -#endif AP_WIN9XCONHOOK_H
\ No newline at end of file diff --git a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.mak b/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.mak deleted file mode 100644 index fe05281fbd3..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/Win9xConHook.mak +++ /dev/null @@ -1,186 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on Win9xConHook.dsp -!IF "$(CFG)" == "" -CFG=Win9xConHook - Win32 Release -!MESSAGE No configuration specified. Defaulting to Win9xConHook - Win32\ - Release. -!ENDIF - -!IF "$(CFG)" != "Win9xConHook - Win32 Release" && "$(CFG)" !=\ - "Win9xConHook - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Win9xConHook.mak" CFG="Win9xConHook - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Win9xConHook - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Win9xConHook - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Win9xConHook - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\Win9xConHook.dll" - -!ELSE - -ALL : "$(OUTDIR)\Win9xConHook.dll" - -!ENDIF - -CLEAN : - -@erase "$(INTDIR)\Win9xConHook.idb" - -@erase "$(INTDIR)\Win9xConHook.obj" - -@erase "$(OUTDIR)\Win9xConHook.dll" - -@erase "$(OUTDIR)\Win9xConHook.exp" - -@erase "$(OUTDIR)\Win9xConHook.lib" - -@erase "$(OUTDIR)\Win9xConHook.map" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\Win9xConHook.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000"\ - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb"\ - /map:"$(INTDIR)\Win9xConHook.map" /machine:I386 /def:".\Win9xConHook.def"\ - /out:"$(OUTDIR)\Win9xConHook.dll" /implib:"$(OUTDIR)\Win9xConHook.lib" -DEF_FILE= \ - ".\Win9xConHook.def" -LINK32_OBJS= \ - "$(INTDIR)\Win9xConHook.obj" - -"$(OUTDIR)\Win9xConHook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "Win9xConHook - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\Win9xConHook.dll" - -!ELSE - -ALL : "$(OUTDIR)\Win9xConHook.dll" - -!ENDIF - -CLEAN : - -@erase "$(INTDIR)\Win9xConHook.idb" - -@erase "$(INTDIR)\Win9xConHook.obj" - -@erase "$(OUTDIR)\Win9xConHook.dll" - -@erase "$(OUTDIR)\Win9xConHook.exp" - -@erase "$(OUTDIR)\Win9xConHook.lib" - -@erase "$(OUTDIR)\Win9xConHook.map" - -@erase "$(OUTDIR)\Win9xConHook.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\Win9xConHook.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000"\ - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb"\ - /map:"$(INTDIR)\Win9xConHook.map" /debug /machine:I386\ - /def:".\Win9xConHook.def" /out:"$(OUTDIR)\Win9xConHook.dll"\ - /implib:"$(OUTDIR)\Win9xConHook.lib" -DEF_FILE= \ - ".\Win9xConHook.def" -LINK32_OBJS= \ - "$(INTDIR)\Win9xConHook.obj" - -"$(OUTDIR)\Win9xConHook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "Win9xConHook - Win32 Release" || "$(CFG)" ==\ - "Win9xConHook - Win32 Debug" -SOURCE=.\Win9xConHook.c - -"$(INTDIR)\Win9xConHook.obj" : $(SOURCE) "$(INTDIR)" - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/apache.ico b/usr.sbin/httpd/src/os/win32/win32/apache.ico Binary files differdeleted file mode 100644 index bfb4f63ab62..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/apache.ico +++ /dev/null diff --git a/usr.sbin/httpd/src/os/win32/win32/apache.rc b/usr.sbin/httpd/src/os/win32/win32/apache.rc deleted file mode 100644 index 6dde63f9501..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/apache.rc +++ /dev/null @@ -1,84 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winresrc.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Neutral resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_APACHE ICON DISCARDABLE "apache.ico" -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (U.K.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""winresrc.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.K.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/usr.sbin/httpd/src/os/win32/win32/getopt.c b/usr.sbin/httpd/src/os/win32/win32/getopt.c deleted file mode 100644 index 12a1674a6c9..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/getopt.c +++ /dev/null @@ -1,231 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifdef WIN32 - -#include <stdio.h> -#include <string.h> -#include <assert.h> -#include <stdlib.h> - -#define OPTERRCOLON (1) -#define OPTERRNF (2) -#define OPTERRARG (3) - -char *optarg; -int optreset = 0; -int optind = 1; -int opterr = 1; -int optopt; - -static int -optiserr(int argc, char * const *argv, int oint, const char *optstr, - int optchr, int err) -{ - if(opterr) - { - fprintf(stderr, "Error in argument %d, char %d: ", oint, optchr+1); - switch(err) - { - case OPTERRCOLON: - fprintf(stderr, ": in flags\n"); - break; - case OPTERRNF: - fprintf(stderr, "option not found %c\n", argv[oint][optchr]); - break; - case OPTERRARG: - fprintf(stderr, "no argument for option %c\n", argv[oint][optchr]); - break; - default: - fprintf(stderr, "unknown\n"); - break; - } - } - optopt = argv[oint][optchr]; - return('?'); -} - - - -int -getopt(int argc, char* const *argv, const char *optstr) -{ - static int optchr = 0; - static int dash = 0; /* have already seen the - */ - - char *cp; - - if (optreset) - optreset = optchr = dash = 0; - if(optind >= argc) - return(EOF); - if(!dash && (argv[optind][0] != '-')) - return(EOF); - if(!dash && (argv[optind][0] == '-') && !argv[optind][1]) - { - /* - * use to specify stdin. Need to let pgm process this and - * the following args - */ - return(EOF); - } - if((argv[optind][0] == '-') && (argv[optind][1] == '-')) - { - /* -- indicates end of args */ - optind++; - return(EOF); - } - if(!dash) - { - assert((argv[optind][0] == '-') && argv[optind][1]); - dash = 1; - optchr = 1; - } - - /* Check if the guy tries to do a -: kind of flag */ - assert(dash); - if(argv[optind][optchr] == ':') - { - dash = 0; - optind++; - return(optiserr(argc, argv, optind-1, optstr, optchr, OPTERRCOLON)); - } - if(!(cp = strchr(optstr, argv[optind][optchr]))) - { - int errind = optind; - int errchr = optchr; - - if(!argv[optind][optchr+1]) - { - dash = 0; - optind++; - } - else - optchr++; - return(optiserr(argc, argv, errind, optstr, errchr, OPTERRNF)); - } - if(cp[1] == ':') - { - dash = 0; - optind++; - if(optind == argc) - return(optiserr(argc, argv, optind-1, optstr, optchr, OPTERRARG)); - optarg = argv[optind++]; - return(*cp); - } - else - { - if(!argv[optind][optchr+1]) - { - dash = 0; - optind++; - } - else - optchr++; - return(*cp); - } - assert(0); - return(0); -} - -#ifdef TESTGETOPT -int - main (int argc, char **argv) - { - int c; - extern char *optarg; - extern int optind; - int aflg = 0; - int bflg = 0; - int errflg = 0; - char *ofile = NULL; - - while ((c = getopt(argc, argv, "abo:")) != EOF) - switch (c) { - case 'a': - if (bflg) - errflg++; - else - aflg++; - break; - case 'b': - if (aflg) - errflg++; - else - bflg++; - break; - case 'o': - ofile = optarg; - (void)printf("ofile = %s\n", ofile); - break; - case '?': - errflg++; - } - if (errflg) { - (void)fprintf(stderr, - "usage: cmd [-a|-b] [-o <filename>] files...\n"); - exit (2); - } - for ( ; optind < argc; optind++) - (void)printf("%s\n", argv[optind]); - return 0; - } - -#endif /* TESTGETOPT */ - -#endif /* WIN32 */ diff --git a/usr.sbin/httpd/src/os/win32/win32/getopt.h b/usr.sbin/httpd/src/os/win32/win32/getopt.h deleted file mode 100644 index 11260060658..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/getopt.h +++ /dev/null @@ -1,73 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifndef GETOPT_H -#define GETOPT_H - -#ifdef WIN32 - -extern char *optarg; -extern int optreset; -extern int optind; -extern int opterr; -extern int optopt; -int getopt(int argc, char* const *argv, const char *optstr); - -#endif /* WIN32 */ - -#endif /* GETOPT_H */
\ No newline at end of file diff --git a/usr.sbin/httpd/src/os/win32/win32/main_win32.c b/usr.sbin/httpd/src/os/win32/win32/main_win32.c deleted file mode 100644 index c732101cf43..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/main_win32.c +++ /dev/null @@ -1,78 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifdef WIN32 - -/* main_win32.c - Apache executable stub file for Win32 - * This file's purpose in life is to load, and call the - * "real" main function, apache_main(), located in ApacheCore.dll - * - * This was done because having the main() function in a DLL, - * although Win32 allows it, seemed wrong. Also, MSVC++ won't - * link an executable without at least one object file. This - * satistifies that requirement. - */ - -__declspec(dllexport) int apache_main(int argc, char *argv[]); - -int main(int argc, char *argv[]) -{ - return apache_main(argc, argv); -} - -#endif /* WIN32 */
\ No newline at end of file diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_auth_anon.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_auth_anon.dsp deleted file mode 100644 index b3659790fba..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_auth_anon.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_auth_anon" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_auth_anon - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_auth_anon.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_auth_anon.mak" CFG="mod_auth_anon - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_auth_anon - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_anon - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_auth_anon - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_auth_anon" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon - -!ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_anon" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@"BaseAddr.ref",mod_auth_anon - -!ENDIF - -# Begin Target - -# Name "mod_auth_anon - Win32 Release" -# Name "mod_auth_anon - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_auth_anon.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_auth_anon.mak b/usr.sbin/httpd/src/os/win32/win32/mod_auth_anon.mak deleted file mode 100644 index ff5fbc6ec06..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_auth_anon.mak +++ /dev/null @@ -1,247 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_auth_anon.dsp -!IF "$(CFG)" == "" -CFG=mod_auth_anon - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_auth_anon - Win32\ - Release. -!ENDIF - -!IF "$(CFG)" != "mod_auth_anon - Win32 Release" && "$(CFG)" !=\ - "mod_auth_anon - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_auth_anon.mak" CFG="mod_auth_anon - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_auth_anon - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_anon - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_auth_anon - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_auth_anon.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_auth_anon.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_auth_anon.idb" - -@erase "$(INTDIR)\mod_auth_anon.obj" - -@erase "$(OUTDIR)\mod_auth_anon.exp" - -@erase "$(OUTDIR)\mod_auth_anon.lib" - -@erase "$(OUTDIR)\mod_auth_anon.map" - -@erase "$(OUTDIR)\mod_auth_anon.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_anon" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_anon.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /map:"$(INTDIR)\mod_auth_anon.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so"\ - /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_anon.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_auth_anon.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_auth_anon.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_auth_anon.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_auth_anon.idb" - -@erase "$(INTDIR)\mod_auth_anon.obj" - -@erase "$(OUTDIR)\mod_auth_anon.exp" - -@erase "$(OUTDIR)\mod_auth_anon.lib" - -@erase "$(OUTDIR)\mod_auth_anon.map" - -@erase "$(OUTDIR)\mod_auth_anon.pdb" - -@erase "$(OUTDIR)\mod_auth_anon.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_anon" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_anon.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /map:"$(INTDIR)\mod_auth_anon.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so"\ - /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_anon.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_auth_anon.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_auth_anon - Win32 Release" || "$(CFG)" ==\ - "mod_auth_anon - Win32 Debug" - -!IF "$(CFG)" == "mod_auth_anon - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_auth_anon.c -DEP_CPP_MOD_A=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\http_request.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_auth_dbm.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_auth_dbm.dsp deleted file mode 100644 index 174c1d5ddfe..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_auth_dbm.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_auth_dbm" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_auth_dbm - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_auth_dbm.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_auth_dbm.mak" CFG="mod_auth_dbm - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_auth_dbm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_dbm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_auth_dbm" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm - -!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_dbm" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@"BaseAddr.ref",mod_auth_dbm - -!ENDIF - -# Begin Target - -# Name "mod_auth_dbm - Win32 Release" -# Name "mod_auth_dbm - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_auth_dbm.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_auth_dbm.mak b/usr.sbin/httpd/src/os/win32/win32/mod_auth_dbm.mak deleted file mode 100644 index 1085c8143e3..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_auth_dbm.mak +++ /dev/null @@ -1,279 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_auth_dbm.dsp -!IF "$(CFG)" == "" -CFG=mod_auth_dbm - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_auth_dbm - Win32\ - Release. -!ENDIF - -!IF "$(CFG)" != "mod_auth_dbm - Win32 Release" && "$(CFG)" !=\ - "mod_auth_dbm - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_auth_dbm.mak" CFG="mod_auth_dbm - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_auth_dbm - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_dbm - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_auth_dbm.so" - -!ELSE - -ALL : "sdbm - Win32 Release" "ApacheCore - Win32 Release"\ - "$(OUTDIR)\mod_auth_dbm.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" "sdbm - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_auth_dbm.idb" - -@erase "$(INTDIR)\mod_auth_dbm.obj" - -@erase "$(OUTDIR)\mod_auth_dbm.exp" - -@erase "$(OUTDIR)\mod_auth_dbm.lib" - -@erase "$(OUTDIR)\mod_auth_dbm.map" - -@erase "$(OUTDIR)\mod_auth_dbm.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_dbm.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /map:"$(INTDIR)\mod_auth_dbm.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so"\ - /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_dbm.obj" \ - "..\..\lib\sdbm\LibR\sdbm.lib" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_auth_dbm.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_auth_dbm.so" - -!ELSE - -ALL : "sdbm - Win32 Debug" "ApacheCore - Win32 Debug"\ - "$(OUTDIR)\mod_auth_dbm.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" "sdbm - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_auth_dbm.idb" - -@erase "$(INTDIR)\mod_auth_dbm.obj" - -@erase "$(OUTDIR)\mod_auth_dbm.exp" - -@erase "$(OUTDIR)\mod_auth_dbm.lib" - -@erase "$(OUTDIR)\mod_auth_dbm.map" - -@erase "$(OUTDIR)\mod_auth_dbm.pdb" - -@erase "$(OUTDIR)\mod_auth_dbm.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_dbm.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /map:"$(INTDIR)\mod_auth_dbm.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so"\ - /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_dbm.obj" \ - "..\..\Debug\ApacheCore.lib" \ - "..\..\lib\sdbm\LibD\sdbm.lib" - -"$(OUTDIR)\mod_auth_dbm.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" || "$(CFG)" ==\ - "mod_auth_dbm - Win32 Debug" - -!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" - -"sdbm - Win32 Release" : - cd "\test\apache-1.3\src\lib\sdbm" - $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Release" - cd "..\..\os\win32" - -"sdbm - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src\lib\sdbm" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Release"\ - RECURSE=1 - cd "..\..\os\win32" - -!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" - -"sdbm - Win32 Debug" : - cd "\test\apache-1.3\src\lib\sdbm" - $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Debug" - cd "..\..\os\win32" - -"sdbm - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src\lib\sdbm" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Debug"\ - RECURSE=1 - cd "..\..\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_auth_dbm.c -DEP_CPP_MOD_A=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\lib\sdbm\sdbm.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_auth_dbm.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_auth_digest.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_auth_digest.dsp deleted file mode 100644 index 63ba484956d..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_auth_digest.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_auth_digest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_auth_digest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_auth_digest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_auth_digest.mak" CFG="mod_auth_digest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_auth_digest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_digest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_auth_digest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_auth_digest" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest -# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest - -!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_digest" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest -# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@"BaseAddr.ref",mod_auth_digest - -!ENDIF - -# Begin Target - -# Name "mod_auth_digest - Win32 Release" -# Name "mod_auth_digest - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\experimental\mod_auth_digest.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_auth_digest.mak b/usr.sbin/httpd/src/os/win32/win32/mod_auth_digest.mak deleted file mode 100644 index 122e5b5f50f..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_auth_digest.mak +++ /dev/null @@ -1,254 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_auth_digest.dsp -!IF "$(CFG)" == "" -CFG=mod_auth_digest - Win32 Debug -!MESSAGE No configuration specified. Defaulting to mod_auth_digest - Win32\ - Debug. -!ENDIF - -!IF "$(CFG)" != "mod_auth_digest - Win32 Release" && "$(CFG)" !=\ - "mod_auth_digest - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_auth_digest.mak" CFG="mod_auth_digest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_auth_digest - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_digest - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_auth_digest - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_auth_digest.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_auth_digest.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_auth_digest.idb" - -@erase "$(INTDIR)\mod_auth_digest.obj" - -@erase "$(OUTDIR)\mod_auth_digest.exp" - -@erase "$(OUTDIR)\mod_auth_digest.lib" - -@erase "$(OUTDIR)\mod_auth_digest.map" - -@erase "$(OUTDIR)\mod_auth_digest.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_digest" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_digest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb"\ - /map:"$(INTDIR)\mod_auth_digest.map" /machine:I386\ - /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib"\ - /base:@"BaseAddr.ref",mod_auth_digest -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_digest.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_auth_digest.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_auth_digest.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_auth_digest.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_auth_digest.idb" - -@erase "$(INTDIR)\mod_auth_digest.obj" - -@erase "$(OUTDIR)\mod_auth_digest.exp" - -@erase "$(OUTDIR)\mod_auth_digest.lib" - -@erase "$(OUTDIR)\mod_auth_digest.map" - -@erase "$(OUTDIR)\mod_auth_digest.pdb" - -@erase "$(OUTDIR)\mod_auth_digest.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_digest" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_digest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb"\ - /map:"$(INTDIR)\mod_auth_digest.map" /debug /machine:I386\ - /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib"\ - /base:@"BaseAddr.ref",mod_auth_digest -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_digest.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_auth_digest.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_auth_digest - Win32 Release" || "$(CFG)" ==\ - "mod_auth_digest - Win32 Debug" - -!IF "$(CFG)" == "mod_auth_digest - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\experimental\mod_auth_digest.c -DEP_CPP_MOD_A=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\ap_sha1.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\http_request.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_md5.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - "..\..\modules\experimental\mm.h"\ - - -"$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_cern_meta.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_cern_meta.dsp deleted file mode 100644 index e6167daaa4e..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_cern_meta.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_cern_meta" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_cern_meta - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_cern_meta.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_cern_meta.mak" CFG="mod_cern_meta - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_cern_meta - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_cern_meta - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_cern_meta - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_cern_meta" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta - -!ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_cern_meta" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_cern_meta.so" /base:@"BaseAddr.ref",mod_cern_meta - -!ENDIF - -# Begin Target - -# Name "mod_cern_meta - Win32 Release" -# Name "mod_cern_meta - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_cern_meta.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_cern_meta.mak b/usr.sbin/httpd/src/os/win32/win32/mod_cern_meta.mak deleted file mode 100644 index 35ac6ab3c46..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_cern_meta.mak +++ /dev/null @@ -1,246 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_cern_meta.dsp -!IF "$(CFG)" == "" -CFG=mod_cern_meta - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_cern_meta - Win32\ - Release. -!ENDIF - -!IF "$(CFG)" != "mod_cern_meta - Win32 Release" && "$(CFG)" !=\ - "mod_cern_meta - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_cern_meta.mak" CFG="mod_cern_meta - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_cern_meta - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_cern_meta - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_cern_meta - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_cern_meta.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_cern_meta.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_cern_meta.idb" - -@erase "$(INTDIR)\mod_cern_meta.obj" - -@erase "$(OUTDIR)\mod_cern_meta.exp" - -@erase "$(OUTDIR)\mod_cern_meta.lib" - -@erase "$(OUTDIR)\mod_cern_meta.map" - -@erase "$(OUTDIR)\mod_cern_meta.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_cern_meta" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_cern_meta.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /map:"$(INTDIR)\mod_cern_meta.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so"\ - /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta -LINK32_OBJS= \ - "$(INTDIR)\mod_cern_meta.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_cern_meta.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_cern_meta.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_cern_meta.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_cern_meta.idb" - -@erase "$(INTDIR)\mod_cern_meta.obj" - -@erase "$(OUTDIR)\mod_cern_meta.exp" - -@erase "$(OUTDIR)\mod_cern_meta.lib" - -@erase "$(OUTDIR)\mod_cern_meta.map" - -@erase "$(OUTDIR)\mod_cern_meta.pdb" - -@erase "$(OUTDIR)\mod_cern_meta.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_cern_meta" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_cern_meta.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /map:"$(INTDIR)\mod_cern_meta.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so"\ - /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta -LINK32_OBJS= \ - "$(INTDIR)\mod_cern_meta.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_cern_meta.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_cern_meta - Win32 Release" || "$(CFG)" ==\ - "mod_cern_meta - Win32 Debug" - -!IF "$(CFG)" == "mod_cern_meta - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_cern_meta.c -DEP_CPP_MOD_C=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_request.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_script.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_C=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_digest.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_digest.dsp deleted file mode 100644 index 04ffb51b70b..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_digest.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_digest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_digest - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_digest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_digest.mak" CFG="mod_digest - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_digest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_digest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_digest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_digest" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_digest.so" /base:@"BaseAddr.ref",mod_digest -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_digest.so" /base:@"BaseAddr.ref",mod_digest - -!ELSEIF "$(CFG)" == "mod_digest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_digest" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_digest.so" /base:@"BaseAddr.ref",mod_digest -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_digest.so" /base:@"BaseAddr.ref",mod_digest - -!ENDIF - -# Begin Target - -# Name "mod_digest - Win32 Release" -# Name "mod_digest - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_digest.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_digest.mak b/usr.sbin/httpd/src/os/win32/win32/mod_digest.mak deleted file mode 100644 index 01488468357..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_digest.mak +++ /dev/null @@ -1,247 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_digest.dsp -!IF "$(CFG)" == "" -CFG=mod_digest - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_digest - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "mod_digest - Win32 Release" && "$(CFG)" !=\ - "mod_digest - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_digest.mak" CFG="mod_digest - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_digest - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_digest - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_digest - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_digest.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_digest.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_digest.idb" - -@erase "$(INTDIR)\mod_digest.obj" - -@erase "$(OUTDIR)\mod_digest.exp" - -@erase "$(OUTDIR)\mod_digest.lib" - -@erase "$(OUTDIR)\mod_digest.map" - -@erase "$(OUTDIR)\mod_digest.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_digest" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_digest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_digest.pdb" /map:"$(INTDIR)\mod_digest.map" /machine:I386\ - /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib"\ - /base:@"BaseAddr.ref",mod_digest -LINK32_OBJS= \ - "$(INTDIR)\mod_digest.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_digest.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_digest - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_digest.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_digest.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_digest.idb" - -@erase "$(INTDIR)\mod_digest.obj" - -@erase "$(OUTDIR)\mod_digest.exp" - -@erase "$(OUTDIR)\mod_digest.lib" - -@erase "$(OUTDIR)\mod_digest.map" - -@erase "$(OUTDIR)\mod_digest.pdb" - -@erase "$(OUTDIR)\mod_digest.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_digest" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_digest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_digest.pdb" /map:"$(INTDIR)\mod_digest.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib"\ - /base:@"BaseAddr.ref",mod_digest -LINK32_OBJS= \ - "$(INTDIR)\mod_digest.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_digest.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_digest - Win32 Release" || "$(CFG)" ==\ - "mod_digest - Win32 Debug" - -!IF "$(CFG)" == "mod_digest - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_digest - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_digest.c -DEP_CPP_MOD_D=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_md5.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_D=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_expires.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_expires.dsp deleted file mode 100644 index 84138309652..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_expires.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_expires" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_expires - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_expires.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_expires.mak" CFG="mod_expires - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_expires - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_expires - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_expires - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_expires" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_expires.so" /base:@"BaseAddr.ref",mod_expires -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_expires.so" /base:@"BaseAddr.ref",mod_expires - -!ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_expires" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_expires.so" /base:@"BaseAddr.ref",mod_expires -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_expires.so" /base:@"BaseAddr.ref",mod_expires - -!ENDIF - -# Begin Target - -# Name "mod_expires - Win32 Release" -# Name "mod_expires - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_expires.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_expires.mak b/usr.sbin/httpd/src/os/win32/win32/mod_expires.mak deleted file mode 100644 index c34f6c3f3c4..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_expires.mak +++ /dev/null @@ -1,243 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_expires.dsp -!IF "$(CFG)" == "" -CFG=mod_expires - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_expires - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "mod_expires - Win32 Release" && "$(CFG)" !=\ - "mod_expires - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_expires.mak" CFG="mod_expires - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_expires - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_expires - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_expires - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_expires.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_expires.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_expires.idb" - -@erase "$(INTDIR)\mod_expires.obj" - -@erase "$(OUTDIR)\mod_expires.exp" - -@erase "$(OUTDIR)\mod_expires.lib" - -@erase "$(OUTDIR)\mod_expires.map" - -@erase "$(OUTDIR)\mod_expires.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_expires" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_expires.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_expires.pdb" /map:"$(INTDIR)\mod_expires.map" /machine:I386\ - /out:"$(OUTDIR)\mod_expires.so" /implib:"$(OUTDIR)\mod_expires.lib"\ - /base:@"BaseAddr.ref",mod_expires -LINK32_OBJS= \ - "$(INTDIR)\mod_expires.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_expires.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_expires.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_expires.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_expires.idb" - -@erase "$(INTDIR)\mod_expires.obj" - -@erase "$(OUTDIR)\mod_expires.exp" - -@erase "$(OUTDIR)\mod_expires.lib" - -@erase "$(OUTDIR)\mod_expires.map" - -@erase "$(OUTDIR)\mod_expires.pdb" - -@erase "$(OUTDIR)\mod_expires.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_expires" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_expires.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_expires.pdb" /map:"$(INTDIR)\mod_expires.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_expires.so"\ - /implib:"$(OUTDIR)\mod_expires.lib" /base:@"BaseAddr.ref",mod_expires -LINK32_OBJS= \ - "$(INTDIR)\mod_expires.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_expires.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_expires - Win32 Release" || "$(CFG)" ==\ - "mod_expires - Win32 Debug" - -!IF "$(CFG)" == "mod_expires - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_expires.c -DEP_CPP_MOD_E=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_E=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_headers.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_headers.dsp deleted file mode 100644 index c45684e2db3..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_headers.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_headers" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_headers - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_headers.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_headers.mak" CFG="mod_headers - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_headers - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_headers - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_headers - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_headers" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_headers.so" /base:@"BaseAddr.ref",mod_headers -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_headers.so" /base:@"BaseAddr.ref",mod_headers - -!ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_headers" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_headers.so" /base:@"BaseAddr.ref",mod_headers -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_headers.so" /base:@"BaseAddr.ref",mod_headers - -!ENDIF - -# Begin Target - -# Name "mod_headers - Win32 Release" -# Name "mod_headers - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_headers.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_headers.mak b/usr.sbin/httpd/src/os/win32/win32/mod_headers.mak deleted file mode 100644 index f6d7564b251..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_headers.mak +++ /dev/null @@ -1,242 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_headers.dsp -!IF "$(CFG)" == "" -CFG=mod_headers - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_headers - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "mod_headers - Win32 Release" && "$(CFG)" !=\ - "mod_headers - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_headers.mak" CFG="mod_headers - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_headers - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_headers - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_headers - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_headers.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_headers.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_headers.idb" - -@erase "$(INTDIR)\mod_headers.obj" - -@erase "$(OUTDIR)\mod_headers.exp" - -@erase "$(OUTDIR)\mod_headers.lib" - -@erase "$(OUTDIR)\mod_headers.map" - -@erase "$(OUTDIR)\mod_headers.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_headers" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_headers.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_headers.pdb" /map:"$(INTDIR)\mod_headers.map" /machine:I386\ - /out:"$(OUTDIR)\mod_headers.so" /implib:"$(OUTDIR)\mod_headers.lib"\ - /base:@"BaseAddr.ref",mod_headers -LINK32_OBJS= \ - "$(INTDIR)\mod_headers.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_headers.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_headers.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_headers.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_headers.idb" - -@erase "$(INTDIR)\mod_headers.obj" - -@erase "$(OUTDIR)\mod_headers.exp" - -@erase "$(OUTDIR)\mod_headers.lib" - -@erase "$(OUTDIR)\mod_headers.map" - -@erase "$(OUTDIR)\mod_headers.pdb" - -@erase "$(OUTDIR)\mod_headers.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_headers" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_headers.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_headers.pdb" /map:"$(INTDIR)\mod_headers.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_headers.so"\ - /implib:"$(OUTDIR)\mod_headers.lib" /base:@"BaseAddr.ref",mod_headers -LINK32_OBJS= \ - "$(INTDIR)\mod_headers.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_headers.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_headers - Win32 Release" || "$(CFG)" ==\ - "mod_headers - Win32 Debug" - -!IF "$(CFG)" == "mod_headers - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_headers.c -DEP_CPP_MOD_H=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_H=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_info.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_info.dsp deleted file mode 100644 index 2301e216b7f..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_info.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_info" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_info - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_info.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_info.mak" CFG="mod_info - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_info - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_info - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_info - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_info" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_info.so" /base:@"BaseAddr.ref",mod_info -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_info.so" /base:@"BaseAddr.ref",mod_info - -!ELSEIF "$(CFG)" == "mod_info - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_info" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_info.so" /base:@"BaseAddr.ref",mod_info -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_info.so" /base:@"BaseAddr.ref",mod_info - -!ENDIF - -# Begin Target - -# Name "mod_info - Win32 Release" -# Name "mod_info - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_info.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_info.mak b/usr.sbin/httpd/src/os/win32/win32/mod_info.mak deleted file mode 100644 index 20b3b8ce38c..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_info.mak +++ /dev/null @@ -1,247 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_info.dsp -!IF "$(CFG)" == "" -CFG=mod_info - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_info - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "mod_info - Win32 Release" && "$(CFG)" !=\ - "mod_info - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_info.mak" CFG="mod_info - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_info - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_info - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_info - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_info.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_info.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_info.idb" - -@erase "$(INTDIR)\mod_info.obj" - -@erase "$(OUTDIR)\mod_info.exp" - -@erase "$(OUTDIR)\mod_info.lib" - -@erase "$(OUTDIR)\mod_info.map" - -@erase "$(OUTDIR)\mod_info.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_info" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_info.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_info.pdb" /map:"$(INTDIR)\mod_info.map" /machine:I386\ - /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib"\ - /base:@"BaseAddr.ref",mod_info -LINK32_OBJS= \ - "$(INTDIR)\mod_info.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_info.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_info - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_info.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_info.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_info.idb" - -@erase "$(INTDIR)\mod_info.obj" - -@erase "$(OUTDIR)\mod_info.exp" - -@erase "$(OUTDIR)\mod_info.lib" - -@erase "$(OUTDIR)\mod_info.map" - -@erase "$(OUTDIR)\mod_info.pdb" - -@erase "$(OUTDIR)\mod_info.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_info" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_info.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_info.pdb" /map:"$(INTDIR)\mod_info.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib"\ - /base:@"BaseAddr.ref",mod_info -LINK32_OBJS= \ - "$(INTDIR)\mod_info.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_info.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_info - Win32 Release" || "$(CFG)" ==\ - "mod_info - Win32 Debug" - -!IF "$(CFG)" == "mod_info - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_info - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_info.c -DEP_CPP_MOD_I=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_script.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_I=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_isapi.c b/usr.sbin/httpd/src/os/win32/win32/mod_isapi.c deleted file mode 100644 index 2e00b990f79..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_isapi.c +++ /dev/null @@ -1,932 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -/* - * mod_isapi.c - Internet Server Application (ISA) module for Apache - * by Alexei Kosut <akosut@apache.org> - * - * This module implements Microsoft's ISAPI, allowing Apache (when running - * under Windows) to load Internet Server Applications (ISAPI extensions). - * It implements all of the ISAPI 2.0 specification, except for the - * "Microsoft-only" extensions dealing with asynchronous I/O. All ISAPI - * extensions that use only synchronous I/O and are compatible with the - * ISAPI 2.0 specification should work (most ISAPI 1.0 extensions should - * function as well). - * - * To load, simply place the ISA in a location in the document tree. - * Then add an "AddHandler isapi-isa dll" into your config file. - * You should now be able to load ISAPI DLLs just be reffering to their - * URLs. Make sure the ExecCGI option is active in the directory - * the ISA is in. - */ - -#ifdef WIN32 - -/* A lousy hack to include ap_check_cmd_context(): */ -#define CORE_PRIVATE - -#include "httpd.h" -#include "http_config.h" -#include "http_core.h" -#include "http_protocol.h" -#include "http_request.h" -#include "http_log.h" -#include "util_script.h" -#include <stdlib.h> -/* We use the exact same header file as the original */ -#include <HttpExt.h> - -/* Seems IIS does not enforce the requirement for \r\n termination on HSE_REQ_SEND_RESPONSE_HEADER, - define this to conform */ -#define RELAX_HEADER_RULE - -#if !defined(HSE_REQ_SEND_RESPONSE_HEADER_EX) \ - || !defined(HSE_REQ_MAP_URL_TO_PATH_EX) -#pragma message("WARNING: This build of Apache is missing the recent changes") -#pragma message("in the Microsoft Win32 Platform SDK; some mod_isapi features") -#pragma message("will be disabled. To obtain the latest Platform SDK files,") -#pragma message("please refer to:") -#pragma message("http://msdn.microsoft.com/downloads/sdks/platform/platform.asp") -#endif - -module isapi_module; - -static DWORD ReadAheadBuffer = 49152; -static int LogNotSupported = -1; -static int AppendLogToErrors = 0; -static int AppendLogToQuery = 0; - -/* Our "Connection ID" structure */ - -typedef struct { - LPEXTENSION_CONTROL_BLOCK ecb; - request_rec *r; - int status; -} isapi_cid; - -/* Declare the ISAPI functions */ - -BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName, - LPVOID lpvBuffer, LPDWORD lpdwSizeofBuffer); -BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes, - DWORD dwReserved); -BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize); -BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest, - LPVOID lpvBuffer, LPDWORD lpdwSize, - LPDWORD lpdwDataType); - -/* - The optimiser blows it totally here. What happens is that autos are addressed relative to the - stack pointer, which, of course, moves around. The optimiser seems to lose track of it somewhere - between setting isapi_entry and calling through it. We work around the problem by forcing it to - use frame pointers. -*/ -#pragma optimize("y",off) - -int isapi_handler (request_rec *r) { - LPEXTENSION_CONTROL_BLOCK ecb = - ap_pcalloc(r->pool, sizeof(struct _EXTENSION_CONTROL_BLOCK)); - HSE_VERSION_INFO *pVer = ap_pcalloc(r->pool, sizeof(HSE_VERSION_INFO)); - - HINSTANCE isapi_handle; - BOOL (*isapi_version)(HSE_VERSION_INFO *); /* entry point 1 */ - DWORD (*isapi_entry)(LPEXTENSION_CONTROL_BLOCK); /* entry point 2 */ - BOOL (*isapi_term)(DWORD); /* optional entry point 3 */ - - isapi_cid *cid = ap_pcalloc(r->pool, sizeof(isapi_cid)); - table *e = r->subprocess_env; - DWORD read; - char *p; - int retval; - int res; - - /* Use similar restrictions as CGIs */ - - if (!(ap_allow_options(r) & OPT_EXECCGI)) - return FORBIDDEN; - - if (r->finfo.st_mode == 0) - return NOT_FOUND; - - if (S_ISDIR(r->finfo.st_mode)) - return FORBIDDEN; - - if (!(isapi_handle = ap_os_dso_load(r->filename))) { - ap_log_rerror(APLOG_MARK, APLOG_ALERT, r, - "ISAPI Could not load DLL: %s", r->filename); - return SERVER_ERROR; - } - - if (!(isapi_version = - (void *)(ap_os_dso_sym(isapi_handle, "GetExtensionVersion")))) { - ap_log_rerror(APLOG_MARK, APLOG_ALERT, r, - "DLL could not load GetExtensionVersion(): %s", - r->filename); - ap_os_dso_unload(isapi_handle); - return SERVER_ERROR; - } - - if (!(isapi_entry = - (void *)(ap_os_dso_sym(isapi_handle, "HttpExtensionProc")))) { - ap_log_rerror(APLOG_MARK, APLOG_ALERT, r, - "DLL could not load HttpExtensionProc(): %s", - r->filename); - ap_os_dso_unload(isapi_handle); - return SERVER_ERROR; - } - - isapi_term = (void *)(ap_os_dso_sym(isapi_handle, "TerminateExtension")); - - /* Run GetExtensionVersion() */ - - if (!(*isapi_version)(pVer)) { - ap_log_rerror(APLOG_MARK, APLOG_ALERT, r, - "ISAPI GetExtensionVersion() failed: %s", r->filename); - ap_os_dso_unload(isapi_handle); - return SERVER_ERROR; - } - - /* Set up variables. There are a couple of special cases for ISAPI. - * XXX: These were taken verbatim from GetServerVariable, and should - * be reviewed carefully. - */ - ap_add_common_vars(r); - ap_add_cgi_vars(r); - ap_table_setn(r->subprocess_env, "UNMAPPED_REMOTE_USER", "REMOTE_USER"); - ap_table_setn(r->subprocess_env, "SERVER_PORT_SECURE", "0"); - ap_table_setn(r->subprocess_env, "URL", r->uri); - - /* Set up connection ID */ - ecb->ConnID = (HCONN)cid; - cid->ecb = ecb; - cid->r = r; - cid->status = 0; - - ecb->cbSize = sizeof(struct _EXTENSION_CONTROL_BLOCK); - ecb->dwVersion = MAKELONG(0, 2); - ecb->dwHttpStatusCode = 0; - strcpy(ecb->lpszLogData, ""); - ecb->lpszMethod = ap_pstrdup(r->pool, r->method); - ecb->lpszQueryString = ap_pstrdup(r->pool, ap_table_get(e, "QUERY_STRING")); - ecb->lpszPathInfo = ap_pstrdup(r->pool, ap_table_get(e, "PATH_INFO")); - ecb->lpszPathTranslated = ap_pstrdup(r->pool, ap_table_get(e, "PATH_TRANSLATED")); - ecb->lpszContentType = ap_pstrdup(r->pool, ap_table_get(e, "CONTENT_TYPE")); - - /* Set up client input */ - if ((retval = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR))) { - if (isapi_term) (*isapi_term)( 2 /* HSE_TERM_MUST_UNLOAD */); - ap_os_dso_unload(isapi_handle); - return retval; - } - - if (ap_should_client_block(r)) { - /* Time to start reading the appropriate amount of data, - * and allow the administrator to tweak the number - * TODO: add the httpd.conf option for ReadAheadBuffer. - */ - if (r->remaining) { - ecb->cbTotalBytes = r->remaining; - if (ecb->cbTotalBytes > ReadAheadBuffer) - ecb->cbAvailable = ReadAheadBuffer; - else - ecb->cbAvailable = ecb->cbTotalBytes; - } - else - { - ecb->cbTotalBytes = 0xffffffff; - ecb->cbAvailable = ReadAheadBuffer; - } - - ecb->lpbData = ap_pcalloc(r->pool, ecb->cbAvailable + 1); - - p = ecb->lpbData; - read = 0; - while (read < ecb->cbAvailable && - ((res = ap_get_client_block(r, ecb->lpbData + read, - ecb->cbAvailable - read)) > 0)) { - read += res; - } - - if (res < 0) { - if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD); - ap_os_dso_unload(isapi_handle); - return SERVER_ERROR; - } - - /* Although its not to spec, IIS seems to null-terminate - * its lpdData string. So we will too. - * - * XXX: This must be an issue... backing out the null - * from the count of bytes. - */ - if (res == 0) - ecb->cbAvailable = ecb->cbTotalBytes = read; - else - ecb->cbAvailable = read; - ecb->lpbData[read] = '\0'; - } - else { - ecb->cbTotalBytes = 0; - ecb->cbAvailable = 0; - ecb->lpbData = NULL; - } - - /* Set up the callbacks */ - - ecb->GetServerVariable = &GetServerVariable; - ecb->WriteClient = &WriteClient; - ecb->ReadClient = &ReadClient; - ecb->ServerSupportFunction = &ServerSupportFunction; - - /* All right... try and load the sucker */ - retval = (*isapi_entry)(ecb); - - /* Set the status (for logging) */ - if (ecb->dwHttpStatusCode) - r->status = ecb->dwHttpStatusCode; - - /* Check for a log message - and log it */ - if (ecb->lpszLogData && strcmp(ecb->lpszLogData, "")) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r, - "ISAPI: %s: %s", ecb->lpszLogData, r->filename); - - /* Soak up any remaining input */ - if (r->remaining > 0) { - char argsbuffer[HUGE_STRING_LEN]; - while (ap_get_client_block(r, argsbuffer, HUGE_STRING_LEN) > 0); - } - - /* All done with the DLL... get rid of it */ - if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD); - ap_os_dso_unload(isapi_handle); - - switch(retval) { - case HSE_STATUS_SUCCESS: - case HSE_STATUS_SUCCESS_AND_KEEP_CONN: - /* Ignore the keepalive stuff; Apache handles it just fine without - * the ISA's "advice". - */ - - if (cid->status) /* We have a special status to return */ - return cid->status; - - return OK; - case HSE_STATUS_PENDING: /* We don't support this */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI asynchronous I/O not supported: %s", - r->filename); - case HSE_STATUS_ERROR: - default: - return SERVER_ERROR; - } - -} -#pragma optimize("",on) - -BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName, - LPVOID lpvBuffer, LPDWORD lpdwSizeofBuffer) { - request_rec *r = ((isapi_cid *)hConn)->r; - const char *result; - DWORD len; - - if (!strcmp(lpszVariableName, "ALL_HTTP")) { - /* lf delimited, colon split, comma seperated and - * null terminated list of HTTP_ vars - */ - char **env = (char**) ap_table_elts(r->subprocess_env)->elts; - int nelts = 2 * ap_table_elts(r->subprocess_env)->nelts; - int i; - - for (len = 0, i = 0; i < nelts; i += 2) - if (!strncmp(env[i], "HTTP_", 5)) - len += strlen(env[i]) + strlen(env[i + 1]) + 2; - - if (*lpdwSizeofBuffer < len + 1) { - *lpdwSizeofBuffer = len + 1; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - for (i = 0; i < nelts; i += 2) - if (!strncmp(env[i], "HTTP_", 5)) { - strcpy(lpvBuffer, env[i]); - ((char*)lpvBuffer) += strlen(env[i]); - *(((char*)lpvBuffer)++) = ':'; - strcpy(lpvBuffer, env[i + 1]); - ((char*)lpvBuffer) += strlen(env[i + 1]); - *(((char*)lpvBuffer)++) = '\n'; - } - *(((char*)lpvBuffer)++) = '\0'; - *lpdwSizeofBuffer = len; - return TRUE; - } - - if (!strcmp(lpszVariableName, "ALL_RAW")) { - /* lf delimited, colon split, comma seperated and - * null terminated list of the raw request header - */ - char **raw = (char**) ap_table_elts(r->headers_in)->elts; - int nelts = 2 * ap_table_elts(r->headers_in)->nelts; - int i; - - for (len = 0, i = 0; i < nelts; i += 2) - len += strlen(raw[i]) + strlen(raw[i + 1]) + 2; - - if (*lpdwSizeofBuffer < len + 1) { - *lpdwSizeofBuffer = len + 1; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - for (i = 0; i < nelts; i += 2) { - strcpy(lpvBuffer, raw[i]); - ((char*)lpvBuffer) += strlen(raw[i]); - *(((char*)lpvBuffer)++) = ':'; - *(((char*)lpvBuffer)++) = ' '; - strcpy(lpvBuffer, raw[i + 1]); - ((char*)lpvBuffer) += strlen(raw[i + 1]); - *(((char*)lpvBuffer)++) = '\n'; - i += 2; - } - *(((char*)lpvBuffer)++) = '\0'; - *lpdwSizeofBuffer = len; - return TRUE; - } - - /* Not a special case */ - result = ap_table_get(r->subprocess_env, lpszVariableName); - if (result) { - len = strlen(result); - if (*lpdwSizeofBuffer < len + 1) { - *lpdwSizeofBuffer = len + 1; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - strcpy(lpvBuffer, result); - *lpdwSizeofBuffer = len; - return TRUE; - } - - /* Not Found */ - SetLastError(ERROR_INVALID_INDEX); - return FALSE; -} - -BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes, - DWORD dwReserved) { - request_rec *r = ((isapi_cid *)ConnID)->r; - - /* We only support synchronous writing */ - if (dwReserved && dwReserved != HSE_IO_SYNC) { - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI asynchronous I/O not supported: %s", - r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if ((*lpwdwBytes = ap_rwrite(Buffer, *lpwdwBytes, r)) <= 0) { - if (!GetLastError()) - SetLastError(ERROR); /* XXX: Find the right error code */ - return FALSE; - } - - return TRUE; -} - -BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize) { - request_rec *r = ((isapi_cid *)ConnID)->r; - DWORD read = 0; - int res; - - if (r->remaining < (long) *lpdwSize) - *lpdwSize = r->remaining; - - while (read < *lpdwSize && - ((res = ap_get_client_block(r, (char*)lpvBuffer + read, - *lpdwSize - read)) > 0)) { - if (res < 0) { - *lpdwSize = 0; - if (!GetLastError()) - SetLastError(ERROR); /* XXX: Find the right error code */ - return FALSE; - } - - read += res; - } - - *lpdwSize = read; - return TRUE; -} - -static BOOL SendResponseHeaderEx(isapi_cid *cid, const char *stat, - const char *head, DWORD statlen, - DWORD headlen) -{ - int termarg; - char *termch; - - if (!stat || statlen == 0 || !*stat) { - stat = "Status: 200 OK"; - } - else { - char *newstat; - newstat = ap_palloc(cid->r->pool, statlen + 9); - strcpy(newstat, "Status: "); - ap_cpystrn(newstat + 8, stat, statlen + 1); - stat = newstat; - } - - if (!head || headlen == 0 || !*head) { - head = "\r\n"; - } - else - { - if (head[headlen]) { - /* Whoops... not NULL terminated */ - head = ap_pstrndup(cid->r->pool, head, headlen); - } - } - - /* Parse them out, or die trying */ - cid->status = ap_scan_script_header_err_strs(cid->r, NULL, &termch, - &termarg, stat, head, NULL); - cid->ecb->dwHttpStatusCode = cid->r->status; - - /* All the headers should be set now */ - ap_send_http_header(cid->r); - - /* Any data left should now be sent directly, - * it may be raw if headlen was provided. - */ - if (termch && (termarg == 1)) { - if (headlen == -1 && *termch) - ap_rputs(termch, cid->r); - else if (headlen > (size_t) (termch - head)) - ap_rwrite(termch, headlen - (termch - head), cid->r); - } - - if (cid->status == HTTP_INTERNAL_SERVER_ERROR) - return FALSE; - return TRUE; -} - -/* XXX: Is there is still an O(n^2) attack possible here? Please detail. */ -BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest, - LPVOID lpvBuffer, LPDWORD lpdwSize, - LPDWORD lpdwDataType) { - isapi_cid *cid = (isapi_cid *)hConn; - request_rec *r = cid->r; - request_rec *subreq; - - switch (dwHSERequest) { - case 1: /* HSE_REQ_SEND_URL_REDIRECT_RESP */ - /* Set the status to be returned when the HttpExtensionProc() - * is done. - * WARNING: Microsoft now advertises HSE_REQ_SEND_URL_REDIRECT_RESP - * and HSE_REQ_SEND_URL as equivalant per the Jan 2000 SDK. - * They most definately are not, even in their own samples. - */ - ap_table_set(r->headers_out, "Location", lpvBuffer); - cid->status = cid->r->status - = cid->ecb->dwHttpStatusCode = HTTP_MOVED_TEMPORARILY; - return TRUE; - - case 2: /* HSE_REQ_SEND_URL */ - /* Soak up remaining input (there should be none) */ - if (r->remaining > 0) { - char argsbuffer[HUGE_STRING_LEN]; - while (ap_get_client_block(r, argsbuffer, HUGE_STRING_LEN) > 0); - } - - /* Reset the method to GET */ - r->method = ap_pstrdup(r->pool, "GET"); - r->method_number = M_GET; - - /* Don't let anyone think there's still data */ - ap_table_unset(r->headers_in, "Content-Length"); - - /* AV fault per PR3598 - redirected path is lost! */ - (char*)lpvBuffer = ap_pstrdup(r->pool, (char*)lpvBuffer); - ap_internal_redirect((char*)lpvBuffer, r); - return TRUE; - - case 3: /* HSE_REQ_SEND_RESPONSE_HEADER */ - { - /* Parse them out, or die trying */ - DWORD statlen = 0, headlen = 0; - if (lpvBuffer) - statlen = strlen((char*) lpvBuffer); - if (lpdwDataType) - headlen = strlen((char*) lpdwDataType); - return SendResponseHeaderEx(cid, (char*) lpvBuffer, (char*) lpdwDataType, - statlen, headlen); - } - - case 4: /* HSE_REQ_DONE_WITH_SESSION */ - /* Do nothing... since we don't support async I/O, they'll - * return from HttpExtensionProc soon - */ - return TRUE; - - case 1001: /* HSE_REQ_MAP_URL_TO_PATH */ - { - /* Map a URL to a filename */ - char *file = (char *)lpvBuffer; - DWORD len; - subreq = ap_sub_req_lookup_uri(ap_pstrndup(r->pool, file, *lpdwSize), r); - - len = ap_cpystrn(file, subreq->filename, *lpdwSize) - file; - - /* IIS puts a trailing slash on directories, Apache doesn't */ - if (S_ISDIR (subreq->finfo.st_mode)) { - if (len < *lpdwSize - 1) { - file[len++] = '\\'; - file[len] = '\0'; - } - } - *lpdwSize = len; - return TRUE; - } - - case 1002: /* HSE_REQ_GET_SSPI_INFO */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI ServerSupportFunction HSE_REQ_GET_SSPI_INFO " - "is not supported: %s", r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - - case 1003: /* HSE_APPEND_LOG_PARAMETER */ - /* Log lpvBuffer, of lpdwSize bytes, in the URI Query (cs-uri-query) field - * This code will do for now... - */ - ap_table_set(r->notes, "isapi-parameter", (char*) lpvBuffer); - if (AppendLogToQuery) { - if (r->args) - r->args = ap_pstrcat(r->pool, r->args, (char*) lpvBuffer, NULL); - else - r->args = ap_pstrdup(r->pool, (char*) lpvBuffer); - } - if (AppendLogToErrors) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, r, - "ISAPI %s: %s", cid->r->filename, - (char*) lpvBuffer); - return TRUE; - - /* We don't support all this async I/O, Microsoft-specific stuff */ - case 1005: /* HSE_REQ_IO_COMPLETION */ - case 1006: /* HSE_REQ_TRANSMIT_FILE */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI asynchronous I/O not supported: %s", - r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - - case 1007: /* HSE_REQ_REFRESH_ISAPI_ACL */ - /* Since we don't override the user ID and access, we can't reset. - */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI ServerSupportFunction " - "HSE_REQ_REFRESH_ISAPI_ACL " - "is not supported: %s", r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - - case 1008: /* HSE_REQ_IS_KEEP_CONN */ - *((LPBOOL) lpvBuffer) = (r->connection->keepalive == 1); - return TRUE; - - case 1010: /* HSE_REQ_ASYNC_READ_CLIENT */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI asynchronous I/O not supported: %s", - r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - - case 1011: /* HSE_REQ_GET_IMPERSONATION_TOKEN Added in ISAPI 4.0 */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI ServerSupportFunction " - "HSE_REQ_GET_IMPERSONATION_TOKEN " - "is not supported: %s", r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - -#ifdef HSE_REQ_MAP_URL_TO_PATH_EX - case 1012: /* HSE_REQ_MAP_URL_TO_PATH_EX */ - { - /* Map a URL to a filename */ - LPHSE_URL_MAPEX_INFO info = (LPHSE_URL_MAPEX_INFO) lpdwDataType; - char* test_uri = ap_pstrndup(r->pool, (char *)lpvBuffer, *lpdwSize); - - subreq = ap_sub_req_lookup_uri(test_uri, r); - info->cchMatchingURL = strlen(test_uri); - info->cchMatchingPath = ap_cpystrn(info->lpszPath, subreq->filename, - MAX_PATH) - info->lpszPath; - - /* Mapping started with assuming both strings matched. - * Now roll on the path_info as a mismatch and handle - * terminating slashes for directory matches. - */ - if (subreq->path_info && *subreq->path_info) { - ap_cpystrn(info->lpszPath + info->cchMatchingPath, - subreq->path_info, MAX_PATH - info->cchMatchingPath); - info->cchMatchingURL -= strlen(subreq->path_info); - if (S_ISDIR(subreq->finfo.st_mode) - && info->cchMatchingPath < MAX_PATH - 1) { - /* roll forward over path_info's first slash */ - ++info->cchMatchingPath; - ++info->cchMatchingURL; - } - } - else if (S_ISDIR(subreq->finfo.st_mode) - && info->cchMatchingPath < MAX_PATH - 1) { - /* Add a trailing slash for directory */ - info->lpszPath[info->cchMatchingPath++] = '/'; - info->lpszPath[info->cchMatchingPath] = '\0'; - } - - /* If the matched isn't a file, roll match back to the prior slash */ - if (!subreq->finfo.st_mode) { - while (info->cchMatchingPath && info->cchMatchingURL) { - if (info->lpszPath[info->cchMatchingPath - 1] == '/') - break; - --info->cchMatchingPath; - --info->cchMatchingURL; - } - } - - /* Paths returned with back slashes */ - for (test_uri = info->lpszPath; *test_uri; ++test_uri) - if (*test_uri == '/') - *test_uri = '\\'; - - /* is a combination of: - * HSE_URL_FLAGS_READ 0x001 Allow read - * HSE_URL_FLAGS_WRITE 0x002 Allow write - * HSE_URL_FLAGS_EXECUTE 0x004 Allow execute - * HSE_URL_FLAGS_SSL 0x008 Require SSL - * HSE_URL_FLAGS_DONT_CACHE 0x010 Don't cache (VRoot only) - * HSE_URL_FLAGS_NEGO_CERT 0x020 Allow client SSL cert - * HSE_URL_FLAGS_REQUIRE_CERT 0x040 Require client SSL cert - * HSE_URL_FLAGS_MAP_CERT 0x080 Map client SSL cert to account - * HSE_URL_FLAGS_SSL128 0x100 Require 128-bit SSL cert - * HSE_URL_FLAGS_SCRIPT 0x200 Allow script execution - * - * XxX: As everywhere, EXEC flags could use some work... - * and this could go further with more flags, as desired. - */ - info->dwFlags = (subreq->finfo.st_mode & _S_IREAD ? 0x001 : 0) - | (subreq->finfo.st_mode & _S_IWRITE ? 0x002 : 0) - | (subreq->finfo.st_mode & _S_IEXEC ? 0x204 : 0); - return TRUE; - } -#endif - - case 1014: /* HSE_REQ_ABORTIVE_CLOSE */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI ServerSupportFunction HSE_REQ_ABORTIVE_CLOSE" - " is not supported: %s", r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - - case 1015: /* HSE_REQ_GET_CERT_INFO_EX Added in ISAPI 4.0 */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI ServerSupportFunction " - "HSE_REQ_GET_CERT_INFO_EX " - "is not supported: %s", r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - -#ifdef HSE_REQ_SEND_RESPONSE_HEADER_EX - case 1016: /* HSE_REQ_SEND_RESPONSE_HEADER_EX Added in ISAPI 4.0 */ - { - LPHSE_SEND_HEADER_EX_INFO shi - = (LPHSE_SEND_HEADER_EX_INFO) lpvBuffer; - /* XXX: ignore shi->fKeepConn? We shouldn't need the advise */ - /* r->connection->keepalive = shi->fKeepConn; */ - return SendResponseHeaderEx(cid, shi->pszStatus, shi->pszHeader, - shi->cchStatus, shi->cchHeader); - } -#endif - - case 1017: /* HSE_REQ_CLOSE_CONNECTION Added after ISAPI 4.0 */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI ServerSupportFunction " - "HSE_REQ_CLOSE_CONNECTION " - "is not supported: %s", r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - - case 1018: /* HSE_REQ_IS_CONNECTED Added after ISAPI 4.0 */ - /* Returns True if client is connected c.f. MSKB Q188346 - * XXX: That statement is very ambigious... assuming the - * identical return mechanism as HSE_REQ_IS_KEEP_CONN. - */ - *((LPBOOL) lpvBuffer) = (r->connection->aborted == 0); - return TRUE; - - case 1020: /* HSE_REQ_EXTENSION_TRIGGER Added after ISAPI 4.0 */ - /* Undocumented - defined by the Microsoft Jan '00 Platform SDK - */ - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI ServerSupportFunction " - "HSE_REQ_EXTENSION_TRIGGER " - "is not supported: %s", r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - - - default: - if (LogNotSupported) - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r, - "ISAPI ServerSupportFunction (%d) not supported: " - "%s", dwHSERequest, r->filename); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } -} - -/* - * Command handler for the ISAPIReadAheadBuffer directive, which is TAKE1 - */ -static const char *isapi_cmd_readaheadbuffer(cmd_parms *cmd, void *config, - char *arg) -{ - long val; - const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); - if (err != NULL) { - return err; - } - - if (((val = strtol(arg, (char **) &err, 10)) <= 0) || *err) - return "ISAPIReadAheadBuffer must be a legitimate value."; - - ReadAheadBuffer = val; - return NULL; -} - -/* - * Command handler for the ISAPIReadAheadBuffer directive, which is TAKE1 - */ -static const char *isapi_cmd_lognotsupported(cmd_parms *cmd, void *config, - char *arg) -{ - const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); - if (err != NULL) { - return err; - } - - if (strcasecmp(arg, "on") == 0) { - LogNotSupported = -1; - } - else if (strcasecmp(arg, "off") == 0) { - LogNotSupported = 0; - } - else { - return "ISAPILogNotSupported must be on or off"; - } - return NULL; -} - -static const char *isapi_cmd_appendlogtoerrors(cmd_parms *cmd, void *config, - char *arg) -{ - const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); - if (err != NULL) { - return err; - } - - if (strcasecmp(arg, "on") == 0) { - AppendLogToErrors = -1; - } - else if (strcasecmp(arg, "off") == 0) { - AppendLogToErrors = 0; - } - else { - return "ISAPIAppendLogToErrors must be on or off"; - } - return NULL; -} - -static const char *isapi_cmd_appendlogtoquery(cmd_parms *cmd, void *config, - char *arg) -{ - const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); - if (err != NULL) { - return err; - } - - if (strcasecmp(arg, "on") == 0) { - AppendLogToQuery = -1; - } - else if (strcasecmp(arg, "off") == 0) { - AppendLogToQuery = 0; - } - else { - return "ISAPIAppendLogToQuery must be on or off"; - } - return NULL; -} - -static const command_rec isapi_cmds[] = { -{ "ISAPIReadAheadBuffer", isapi_cmd_readaheadbuffer, NULL, RSRC_CONF, TAKE1, - "Maximum bytes to initially pass to the ISAPI handler" }, -{ "ISAPILogNotSupported", isapi_cmd_lognotsupported, NULL, RSRC_CONF, TAKE1, - "Log requests not supported by the ISAPI server" }, -{ "ISAPIAppendLogToErrors", isapi_cmd_appendlogtoerrors, NULL, RSRC_CONF, TAKE1, - "Send all Append Log requests to the error log" }, -{ "ISAPIAppendLogToQuery", isapi_cmd_appendlogtoquery, NULL, RSRC_CONF, TAKE1, - "Append Log requests are concatinated to the query args" }, -{ NULL } -}; - -handler_rec isapi_handlers[] = { -{ "isapi-isa", isapi_handler }, -{ NULL} -}; - -module isapi_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ - NULL, /* create per-dir config */ - NULL, /* merge per-dir config */ - NULL, /* server config */ - NULL, /* merge server config */ - isapi_cmds, /* command table */ - isapi_handlers, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - NULL, /* logger */ - NULL /* header parser */ -}; - -#endif /* WIN32 */ diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_proxy.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_proxy.dsp deleted file mode 100644 index 11df0059407..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_proxy.dsp +++ /dev/null @@ -1,127 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_proxy" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_proxy - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_proxy.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_proxy.mak" CFG="mod_proxy - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_proxy - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_proxy - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_proxy - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\mod_proxy" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy -# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy - -!ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\ApacheM0" -# PROP BASE Intermediate_Dir ".\ApacheM0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_proxy" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy -# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_proxy.so" /base:@"BaseAddr.ref",mod_proxy - -!ENDIF - -# Begin Target - -# Name "mod_proxy - Win32 Release" -# Name "mod_proxy - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" -# Begin Source File - -SOURCE=..\..\modules\proxy\mod_proxy.c -# End Source File -# Begin Source File - -SOURCE=..\..\modules\proxy\proxy_cache.c -# End Source File -# Begin Source File - -SOURCE=..\..\modules\proxy\proxy_connect.c -# End Source File -# Begin Source File - -SOURCE=..\..\modules\proxy\proxy_ftp.c -# End Source File -# Begin Source File - -SOURCE=..\..\modules\proxy\proxy_http.c -# End Source File -# Begin Source File - -SOURCE=..\..\modules\proxy\proxy_util.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=..\..\modules\proxy\mod_proxy.h -# End Source File -# End Group -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_proxy.mak b/usr.sbin/httpd/src/os/win32/win32/mod_proxy.mak deleted file mode 100644 index 178f806d4f5..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_proxy.mak +++ /dev/null @@ -1,461 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_proxy.dsp -!IF "$(CFG)" == "" -CFG=mod_proxy - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_proxy - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "mod_proxy - Win32 Release" && "$(CFG)" !=\ - "mod_proxy - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_proxy.mak" CFG="mod_proxy - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_proxy - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_proxy - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "mod_proxy - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_proxy.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_proxy.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_proxy.idb" - -@erase "$(INTDIR)\mod_proxy.obj" - -@erase "$(INTDIR)\proxy_cache.obj" - -@erase "$(INTDIR)\proxy_connect.obj" - -@erase "$(INTDIR)\proxy_ftp.obj" - -@erase "$(INTDIR)\proxy_http.obj" - -@erase "$(INTDIR)\proxy_util.obj" - -@erase "$(OUTDIR)\mod_proxy.exp" - -@erase "$(OUTDIR)\mod_proxy.lib" - -@erase "$(OUTDIR)\mod_proxy.map" - -@erase "$(OUTDIR)\mod_proxy.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_proxy.so" /implib:"$(OUTDIR)\mod_proxy.lib"\ - /base:@"BaseAddr.ref",mod_proxy -LINK32_OBJS= \ - "$(INTDIR)\mod_proxy.obj" \ - "$(INTDIR)\proxy_cache.obj" \ - "$(INTDIR)\proxy_connect.obj" \ - "$(INTDIR)\proxy_ftp.obj" \ - "$(INTDIR)\proxy_http.obj" \ - "$(INTDIR)\proxy_util.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_proxy.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_proxy.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_proxy.idb" - -@erase "$(INTDIR)\mod_proxy.obj" - -@erase "$(INTDIR)\proxy_cache.obj" - -@erase "$(INTDIR)\proxy_connect.obj" - -@erase "$(INTDIR)\proxy_ftp.obj" - -@erase "$(INTDIR)\proxy_http.obj" - -@erase "$(INTDIR)\proxy_util.obj" - -@erase "$(OUTDIR)\mod_proxy.exp" - -@erase "$(OUTDIR)\mod_proxy.lib" - -@erase "$(OUTDIR)\mod_proxy.map" - -@erase "$(OUTDIR)\mod_proxy.pdb" - -@erase "$(OUTDIR)\mod_proxy.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\ - /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\ - /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy -LINK32_OBJS= \ - "$(INTDIR)\mod_proxy.obj" \ - "$(INTDIR)\proxy_cache.obj" \ - "$(INTDIR)\proxy_connect.obj" \ - "$(INTDIR)\proxy_ftp.obj" \ - "$(INTDIR)\proxy_http.obj" \ - "$(INTDIR)\proxy_util.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - - -!IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" ==\ - "mod_proxy - Win32 Debug" -SOURCE=..\..\modules\proxy\mod_proxy.c -DEP_CPP_MOD_P=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\http_request.h"\ - "..\..\include\http_vhost.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_P=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=..\..\modules\proxy\proxy_cache.c -DEP_CPP_PROXY=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\multithread.h"\ - "..\..\include\util_date.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=..\..\modules\proxy\proxy_connect.c -DEP_CPP_PROXY_=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=..\..\modules\proxy\proxy_ftp.c -DEP_CPP_PROXY_F=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_F=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=..\..\modules\proxy\proxy_http.c -DEP_CPP_PROXY_H=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_date.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_H=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=..\..\modules\proxy\proxy_util.c -DEP_CPP_PROXY_U=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\multithread.h"\ - "..\..\include\util_date.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_U=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!IF "$(CFG)" == "mod_proxy - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\clean\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\clean\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\clean\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\clean\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_rewrite.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_rewrite.dsp deleted file mode 100644 index 8ee7d07d2c2..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_rewrite.dsp +++ /dev/null @@ -1,99 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_rewrite" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_rewrite - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_rewrite.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_rewrite.mak" CFG="mod_rewrite - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_rewrite - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_rewrite - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_rewrite - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\mod_rewrite" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite - -!ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_rewrite" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_rewrite.so" /base:@"BaseAddr.ref",mod_rewrite - -!ENDIF - -# Begin Target - -# Name "mod_rewrite - Win32 Release" -# Name "mod_rewrite - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_rewrite.c -# End Source File -# Begin Source File - -SOURCE=.\passwd.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_rewrite.mak b/usr.sbin/httpd/src/os/win32/win32/mod_rewrite.mak deleted file mode 100644 index de212a24113..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_rewrite.mak +++ /dev/null @@ -1,260 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_rewrite.dsp -!IF "$(CFG)" == "" -CFG=mod_rewrite - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_rewrite - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "mod_rewrite - Win32 Release" && "$(CFG)" !=\ - "mod_rewrite - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_rewrite.mak" CFG="mod_rewrite - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_rewrite - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_rewrite - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_rewrite - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_rewrite.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_rewrite.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_rewrite.idb" - -@erase "$(INTDIR)\mod_rewrite.obj" - -@erase "$(INTDIR)\passwd.obj" - -@erase "$(OUTDIR)\mod_rewrite.exp" - -@erase "$(OUTDIR)\mod_rewrite.lib" - -@erase "$(OUTDIR)\mod_rewrite.map" - -@erase "$(OUTDIR)\mod_rewrite.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\ - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_rewrite.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_rewrite.pdb" /map:"$(INTDIR)\mod_rewrite.map" /machine:I386\ - /out:"$(OUTDIR)\mod_rewrite.so" /implib:"$(OUTDIR)\mod_rewrite.lib"\ - /base:@"BaseAddr.ref",mod_rewrite -LINK32_OBJS= \ - "$(INTDIR)\mod_rewrite.obj" \ - "$(INTDIR)\passwd.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_rewrite.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_rewrite.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_rewrite.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_rewrite.idb" - -@erase "$(INTDIR)\mod_rewrite.obj" - -@erase "$(INTDIR)\passwd.obj" - -@erase "$(OUTDIR)\mod_rewrite.exp" - -@erase "$(OUTDIR)\mod_rewrite.lib" - -@erase "$(OUTDIR)\mod_rewrite.map" - -@erase "$(OUTDIR)\mod_rewrite.pdb" - -@erase "$(OUTDIR)\mod_rewrite.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\ - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_rewrite.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_rewrite.pdb" /map:"$(INTDIR)\mod_rewrite.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_rewrite.so"\ - /implib:"$(OUTDIR)\mod_rewrite.lib" /base:@"BaseAddr.ref",mod_rewrite -LINK32_OBJS= \ - "$(INTDIR)\mod_rewrite.obj" \ - "$(INTDIR)\passwd.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_rewrite.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_rewrite - Win32 Release" || "$(CFG)" ==\ - "mod_rewrite - Win32 Debug" - -!IF "$(CFG)" == "mod_rewrite - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_rewrite.c -DEP_CPP_MOD_R=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_request.h"\ - "..\..\include\http_vhost.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\standard\mod_rewrite.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_R=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\passwd.c -DEP_CPP_PASSW=\ - ".\passwd.h"\ - - -"$(INTDIR)\passwd.obj" : $(SOURCE) $(DEP_CPP_PASSW) "$(INTDIR)" - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_speling.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_speling.dsp deleted file mode 100644 index 8b984cb65ae..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_speling.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_speling" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_speling - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_speling.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_speling.mak" CFG="mod_speling - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_speling - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_speling - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_speling - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_speling" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_speling.so" /base:@"BaseAddr.ref",mod_speling -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_speling.so" /base:@"BaseAddr.ref",mod_speling - -!ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_speling" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_speling.so" /base:@"BaseAddr.ref",mod_speling -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_speling.so" /base:@"BaseAddr.ref",mod_speling - -!ENDIF - -# Begin Target - -# Name "mod_speling - Win32 Release" -# Name "mod_speling - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_speling.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_speling.mak b/usr.sbin/httpd/src/os/win32/win32/mod_speling.mak deleted file mode 100644 index b2a81de57dc..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_speling.mak +++ /dev/null @@ -1,244 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_speling.dsp -!IF "$(CFG)" == "" -CFG=mod_speling - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_speling - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "mod_speling - Win32 Release" && "$(CFG)" !=\ - "mod_speling - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_speling.mak" CFG="mod_speling - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_speling - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_speling - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_speling - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_speling.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_speling.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_speling.idb" - -@erase "$(INTDIR)\mod_speling.obj" - -@erase "$(OUTDIR)\mod_speling.exp" - -@erase "$(OUTDIR)\mod_speling.lib" - -@erase "$(OUTDIR)\mod_speling.map" - -@erase "$(OUTDIR)\mod_speling.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_speling" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_speling.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_speling.pdb" /map:"$(INTDIR)\mod_speling.map" /machine:I386\ - /out:"$(OUTDIR)\mod_speling.so" /implib:"$(OUTDIR)\mod_speling.lib"\ - /base:@"BaseAddr.ref",mod_speling -LINK32_OBJS= \ - "$(INTDIR)\mod_speling.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_speling.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_speling.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_speling.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_speling.idb" - -@erase "$(INTDIR)\mod_speling.obj" - -@erase "$(OUTDIR)\mod_speling.exp" - -@erase "$(OUTDIR)\mod_speling.lib" - -@erase "$(OUTDIR)\mod_speling.map" - -@erase "$(OUTDIR)\mod_speling.pdb" - -@erase "$(OUTDIR)\mod_speling.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_speling" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_speling.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_speling.pdb" /map:"$(INTDIR)\mod_speling.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_speling.so"\ - /implib:"$(OUTDIR)\mod_speling.lib" /base:@"BaseAddr.ref",mod_speling -LINK32_OBJS= \ - "$(INTDIR)\mod_speling.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_speling.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_speling - Win32 Release" || "$(CFG)" ==\ - "mod_speling - Win32 Debug" - -!IF "$(CFG)" == "mod_speling - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_speling.c -DEP_CPP_MOD_S=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_S=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_status.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_status.dsp deleted file mode 100644 index dc911567ec8..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_status.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_status" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_status - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_status.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_status.mak" CFG="mod_status - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_status - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_status - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_status - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_status" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_status.so" /base:@"BaseAddr.ref",mod_status -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_status.so" /base:@"BaseAddr.ref",mod_status - -!ELSEIF "$(CFG)" == "mod_status - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_status" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_status.so" /base:@"BaseAddr.ref",mod_status -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_status.so" /base:@"BaseAddr.ref",mod_status - -!ENDIF - -# Begin Target - -# Name "mod_status - Win32 Release" -# Name "mod_status - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_status.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_status.mak b/usr.sbin/httpd/src/os/win32/win32/mod_status.mak deleted file mode 100644 index 284a6290121..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_status.mak +++ /dev/null @@ -1,249 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_status.dsp -!IF "$(CFG)" == "" -CFG=mod_status - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_status - Win32 Release. -!ENDIF - -!IF "$(CFG)" != "mod_status - Win32 Release" && "$(CFG)" !=\ - "mod_status - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_status.mak" CFG="mod_status - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_status - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_status - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_status - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_status.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_status.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_status.idb" - -@erase "$(INTDIR)\mod_status.obj" - -@erase "$(OUTDIR)\mod_status.exp" - -@erase "$(OUTDIR)\mod_status.lib" - -@erase "$(OUTDIR)\mod_status.map" - -@erase "$(OUTDIR)\mod_status.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_status" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_status.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_status.pdb" /map:"$(INTDIR)\mod_status.map" /machine:I386\ - /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib"\ - /base:@"BaseAddr.ref",mod_status -LINK32_OBJS= \ - "$(INTDIR)\mod_status.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_status.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_status - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_status.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_status.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_status.idb" - -@erase "$(INTDIR)\mod_status.obj" - -@erase "$(OUTDIR)\mod_status.exp" - -@erase "$(OUTDIR)\mod_status.lib" - -@erase "$(OUTDIR)\mod_status.map" - -@erase "$(OUTDIR)\mod_status.pdb" - -@erase "$(OUTDIR)\mod_status.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_status" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_status.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_status.pdb" /map:"$(INTDIR)\mod_status.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib"\ - /base:@"BaseAddr.ref",mod_status -LINK32_OBJS= \ - "$(INTDIR)\mod_status.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_status.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_status - Win32 Release" || "$(CFG)" ==\ - "mod_status - Win32 Debug" - -!IF "$(CFG)" == "mod_status - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_status - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_status.c -DEP_CPP_MOD_S=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\scoreboard.h"\ - "..\..\include\util_script.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_S=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_usertrack.dsp b/usr.sbin/httpd/src/os/win32/win32/mod_usertrack.dsp deleted file mode 100644 index 4775b519018..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_usertrack.dsp +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_usertrack" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_usertrack - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_usertrack.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_usertrack.mak" CFG="mod_usertrack - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_usertrack - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_usertrack - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_usertrack - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Release\mod_usertrack" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /machine:I386 /out:"Release/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack - -!ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_usertrack" /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_usertrack.so" /base:@"BaseAddr.ref",mod_usertrack - -!ENDIF - -# Begin Target - -# Name "mod_usertrack - Win32 Release" -# Name "mod_usertrack - Win32 Debug" -# Begin Source File - -SOURCE=..\..\modules\standard\mod_usertrack.c -# End Source File -# End Target -# End Project diff --git a/usr.sbin/httpd/src/os/win32/win32/mod_usertrack.mak b/usr.sbin/httpd/src/os/win32/win32/mod_usertrack.mak deleted file mode 100644 index 7272c54c149..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/mod_usertrack.mak +++ /dev/null @@ -1,244 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on mod_usertrack.dsp -!IF "$(CFG)" == "" -CFG=mod_usertrack - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_usertrack - Win32\ - Release. -!ENDIF - -!IF "$(CFG)" != "mod_usertrack - Win32 Release" && "$(CFG)" !=\ - "mod_usertrack - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_usertrack.mak" CFG="mod_usertrack - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_usertrack - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_usertrack - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_usertrack - Win32 Release" - -OUTDIR=.\Release -INTDIR=.\Release -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_usertrack.so" - -!ELSE - -ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\mod_usertrack.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_usertrack.idb" - -@erase "$(INTDIR)\mod_usertrack.obj" - -@erase "$(OUTDIR)\mod_usertrack.exp" - -@erase "$(OUTDIR)\mod_usertrack.lib" - -@erase "$(OUTDIR)\mod_usertrack.map" - -@erase "$(OUTDIR)\mod_usertrack.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_usertrack" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_usertrack.pdb" /map:"$(INTDIR)\mod_usertrack.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so"\ - /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack -LINK32_OBJS= \ - "$(INTDIR)\mod_usertrack.obj" \ - "..\..\Release\ApacheCore.lib" - -"$(OUTDIR)\mod_usertrack.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\mod_usertrack.so" - -!ELSE - -ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_usertrack.so" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"ApacheCore - Win32 DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\mod_usertrack.idb" - -@erase "$(INTDIR)\mod_usertrack.obj" - -@erase "$(OUTDIR)\mod_usertrack.exp" - -@erase "$(OUTDIR)\mod_usertrack.lib" - -@erase "$(OUTDIR)\mod_usertrack.map" - -@erase "$(OUTDIR)\mod_usertrack.pdb" - -@erase "$(OUTDIR)\mod_usertrack.so" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_usertrack" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_usertrack.pdb" /map:"$(INTDIR)\mod_usertrack.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so"\ - /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack -LINK32_OBJS= \ - "$(INTDIR)\mod_usertrack.obj" \ - "..\..\Debug\ApacheCore.lib" - -"$(OUTDIR)\mod_usertrack.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - - -!IF "$(CFG)" == "mod_usertrack - Win32 Release" || "$(CFG)" ==\ - "mod_usertrack - Win32 Debug" - -!IF "$(CFG)" == "mod_usertrack - Win32 Release" - -"ApacheCore - Win32 Release" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - - cd ".\os\win32" - -"ApacheCore - Win32 ReleaseCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 - cd ".\os\win32" - -!ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" - -"ApacheCore - Win32 Debug" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" - cd ".\os\win32" - -"ApacheCore - Win32 DebugCLEAN" : - cd "\test\apache-1.3\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 - cd ".\os\win32" - -!ENDIF - -SOURCE=..\..\modules\standard\mod_usertrack.c -DEP_CPP_MOD_U=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_U=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\ebcdic.h"\ - "..\..\include\sfio.h"\ - - -"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - - -!ENDIF - diff --git a/usr.sbin/httpd/src/os/win32/win32/modules.c b/usr.sbin/httpd/src/os/win32/win32/modules.c deleted file mode 100644 index 9abedf0d7c5..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/modules.c +++ /dev/null @@ -1,134 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -/* modules.c --- major modules compiled into Apache for Win32. - * Only insert an entry for a module if it must be compiled into - * the core server - */ - -#ifdef WIN32 - -#include "httpd.h" -#include "http_config.h" - -extern module core_module; -extern module so_module; -extern module mime_module; -extern module access_module; -extern module auth_module; -extern module negotiation_module; -extern module includes_module; -extern module autoindex_module; -extern module dir_module; -extern module cgi_module; -extern module userdir_module; -extern module alias_module; -extern module env_module; -extern module config_log_module; -extern module asis_module; -extern module imap_module; -extern module action_module; -extern module setenvif_module; -extern module isapi_module; - -module *ap_prelinked_modules[] = { - &core_module, - &so_module, - &mime_module, - &access_module, - &auth_module, - &negotiation_module, - &includes_module, - &autoindex_module, - &dir_module, - &cgi_module, - &userdir_module, - &alias_module, - &env_module, - &config_log_module, - &asis_module, - &imap_module, - &action_module, - &setenvif_module, - &isapi_module, - NULL -}; -module *ap_preloaded_modules[] = { - &core_module, - &so_module, - &mime_module, - &access_module, - &auth_module, - &negotiation_module, - &includes_module, - &autoindex_module, - &dir_module, - &cgi_module, - &userdir_module, - &alias_module, - &env_module, - &config_log_module, - &asis_module, - &imap_module, - &action_module, - &setenvif_module, - &isapi_module, - NULL -}; - -#endif /* WIN32 */ diff --git a/usr.sbin/httpd/src/os/win32/win32/monitoring-services.txt b/usr.sbin/httpd/src/os/win32/win32/monitoring-services.txt deleted file mode 100644 index 24665890257..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/monitoring-services.txt +++ /dev/null @@ -1,94 +0,0 @@ -From: William A. Rowe, Jr. -Date: June 7th '00 -Subject: service monitoring in Apache 1.3.13 - -The concept for a taskbar monitor has been thrown around -for a very long while. 1.3.13 introduced Win9x services, -and that added fuel to the mix. Here are some sideband -observations I've made for other developers... - -About Apache as a console, don't start Apache hidden without -any command line arguments if you want to launch it yourself -in a hidden window (it will do the classic test for -AllocConsole/FreeConsole)... drop in some arguments such as -the -f or -r option and it will fly without thinking it is a -service under 9x and NT. - -Rule two, don't use --ntservice as an argument, ever. Only -the Windows NT Service Control Manager is allowed to pass that -flag, and only that flag, when it runs Apache.exe. Do use ---ntservice as the sole argument to the executable name if -you are installing an Apache NT service yourself. - -Rule three, use -k start and -n name when maintaining the -HKLM/Software/Microsoft/Windows/CurrentVersion/RunServices -list, since there is no other way for Apache to know what -the service is named :) And look at any 9x installed service's -RunServices entry in the registry for the start service semantic. - -Rule four, use the WinNT Service Control Manager exclusively -for starting, stopping and restarting Apache as an NT service. -The restart signal is the value 128, as documented in service.h -and service.c - this will continue to work in Apache 2.0. If -it fails, you are handling an older version (pre 1.3.13) of -Apache, and need to stop and then start the service instead. - -Rule five, use the legacy pid-named events to signal Win9x -service Apache to restart and stop the service. But don't -bother looking for httpd.pid files... you can get the pid -right from the hidden service control window. Apache 1.3.13 -and 2.x create a hidden window named for the name of the -service (without the spaces), with a window class of -"ApacheWin95ServiceMonitor", so can use FindWindow to track -down running Win9x services. See the service.c code for how -I accomplished this pretty simply in the -k stop/-k restart -handler. - -Taskbar Monitor App -------------------- - -Basic requirements: a C code application using strictly the -Win32 API, and not MFC or other Win32 frameworks. Could use -the service.c module to share some basic functions. That -module could be extended in Apache 2.0 to make this all easier. - -I think we are looking for an external app that simply acts -as a monitor or allows a stopped service to be started. If -the user logs off, we loose the monitor app, but installed as -a shortcut in the Start group or in the registry key -HKLM/Software/Microsoft/Windows/CurrentVersion/Run -we will be just fine. I'd like to see the monitor run only -one instance to monitor all running services, for memory -and resource conservation. - -I was thinking that the hover/iconbar title would tell them -"Test service is running", or "Test service is stopped". -If they left click, they could stop or restart, or simply -start if it is stopped. There could be a preference that -each service doesn't get it's own individual task icon unless -it is running, if it is a manual start service (or missing -from the RunServices list, which is the equivilant under 9x). - -If a specific service is set to Auto start or is in the -RunServices Win9x registry key, we must show them the stopped -icon, of course. We might also keep the icon for any running -service that stops abruptly. But there could be a 'single -icon' option for the taskbar icon monitor that says show only -a single status icon, for simplicity if the administrator runs -many Apache services. - -But I was hoping that any right click would provide a menu -of all Apache services with their status. e.g. - Test service is stopped - Apache_2 service is running - MyWeb service is running -and each would do the logical submenu, same as if that -specific taskbar icon were left clicked, offering to start or -offering to stop or restart the server, as appropriate. - -Finally, to identify all installed Apache services, just query -the registry key HKLM\SYSTEM\CurrentControlSet\Services for any -key that has the ImagePath value of "...\Apache.exe"... (quotes -are significant here, if the leading quote is ommitted the -entire string ends with the text \Apache.exe - based on Apache's -own service installer in every released version.) diff --git a/usr.sbin/httpd/src/os/win32/win32/multithread.c b/usr.sbin/httpd/src/os/win32/win32/multithread.c deleted file mode 100644 index 180e5332427..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/multithread.c +++ /dev/null @@ -1,315 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifdef WIN32 - -#include "ap_config.h" -#include "multithread.h" - -#include <process.h> -#include <assert.h> - -static int -map_rv(int rv) -{ - switch(rv) - { - case WAIT_OBJECT_0: - case WAIT_ABANDONED: - return(MULTI_OK); - case WAIT_TIMEOUT: - return(MULTI_TIMEOUT); - case WAIT_FAILED: - return(MULTI_ERR); - default: - assert(0); - } - - assert(0); - return(0); -} - - -thread * -create_thread(void (thread_fn)(void *), void *thread_arg) -{ - int id; - int rv; - - rv = _beginthreadex(NULL, 0, (LPTHREAD_START_ROUTINE)thread_fn, - thread_arg, 0, &id); - - return((thread *)rv); -} - - -int -kill_thread(thread *thread_id) -{ - return(TerminateThread(thread_id, 1)); -} - - -int -await_thread(thread *thread_id, int sec_to_wait) -{ - int rv; - - rv = WaitForSingleObject(thread_id, sec_to_wait*1000); - - return(map_rv(rv)); -} - -void -exit_thread(int status) -{ - _endthreadex(status); -} - -void -free_thread(thread *thread_id) -{ - CloseHandle(thread_id); -} - - - -API_EXPORT(mutex *) ap_create_mutex(char *name) -{ - return(CreateMutex(NULL, FALSE, name)); -} - -API_EXPORT(mutex *) ap_open_mutex(char *name) -{ - return(OpenMutex(MUTEX_ALL_ACCESS, FALSE, name)); -} - - -API_EXPORT(int) ap_acquire_mutex(mutex *mutex_id) -{ - int rv; - - rv = WaitForSingleObject(mutex_id, INFINITE); - - return(map_rv(rv)); -} - -API_EXPORT(int) ap_release_mutex(mutex *mutex_id) -{ - return(ReleaseMutex(mutex_id)); -} - -API_EXPORT(void) ap_destroy_mutex(mutex *mutex_id) -{ - CloseHandle(mutex_id); -} - - -semaphore * -create_semaphore(int initial) -{ - return(CreateSemaphore(NULL, initial, 1000000, NULL)); -} - -int acquire_semaphore(semaphore *semaphore_id) -{ - int rv; - - rv = WaitForSingleObject(semaphore_id, INFINITE); - - return(map_rv(rv)); -} - -int release_semaphore(semaphore *semaphore_id) -{ - return(ReleaseSemaphore(semaphore_id, 1, NULL)); -} - -void destroy_semaphore(semaphore *semaphore_id) -{ - CloseHandle(semaphore_id); -} - - -event * -create_event(int manual, int initial, char *name) -{ - return(CreateEvent(NULL, manual, initial, name)); -} - -event * -open_event(char *name) -{ - return(OpenEvent(EVENT_ALL_ACCESS, FALSE, name)); -} - - -int acquire_event(event *event_id) -{ - int rv; - - rv = WaitForSingleObject(event_id, INFINITE); - - return(map_rv(rv)); -} - -int set_event(event *event_id) -{ - return(SetEvent(event_id)); -} - -int reset_event(event *event_id) -{ - return(ResetEvent(event_id)); -} - - -void destroy_event(event *event_id) -{ - CloseHandle(event_id); -} - -#else - - -thread *create_thread(void (thread_fn)(void *thread_arg), - void *thread_arg) -{ - return(NULL); -} - -int kill_thread(thread *thread_id) -{ - return(0); -} - -int await_thread(thread *thread_id, int sec_to_wait) -{ - return(0); -} - -void exit_thread(int status) -{} - -void free_thread(thread *thread_id) -{} - - -mutex *ap_create_mutex(char *name) -{ - return(NULL); -} - -mutex *ap_open_mutex(char *name) -{ - return(NULL); -} - -int ap_acquire_mutex(mutex *mutex_id) -{ - return(0); -} -int ap_release_mutex(mutex *mutex_id) -{ - return(0); -} -void ap_destroy_mutex(mutex *mutex_id) -{} - - -semaphore *create_semaphore(int initial) -{ - return(NULL); -} -int acquire_semaphore(semaphore *semaphore_id) -{ - return(0); -} -int release_semaphore(semaphore *semaphore_id) -{ - return(0); -} -void destroy_semaphore(semaphore *semaphore_id) -{} - -event *create_event(int manual, int initial, char *name) -{ - return(NULL); -} -event *open_event(char *name) -{ - return(NULL); -} -int acquire_event(event *event_id) -{ - return(0); -} -int set_event(event *event_id) -{ - return(0); -} -int reset_event(event *event_id) -{ - return(0); -} -void destroy_event(event *event_id) -{} - - -#endif /* WIN32 */ - diff --git a/usr.sbin/httpd/src/os/win32/win32/os.c b/usr.sbin/httpd/src/os/win32/win32/os.c deleted file mode 100644 index bb49d37cc73..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/os.c +++ /dev/null @@ -1,65 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -/* - * OS abstraction functions. Small functions should be defined - * as "__inline" in os.h. - */ - -#include "os.h" - diff --git a/usr.sbin/httpd/src/os/win32/win32/os.h b/usr.sbin/httpd/src/os/win32/win32/os.h deleted file mode 100644 index 0aa3a429492..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/os.h +++ /dev/null @@ -1,212 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifndef APACHE_OS_H -#define APACHE_OS_H - -#ifdef WIN32 - -/* - * Compile the server including all the Windows NT 4.0 header files by - * default. We still want the server to run on Win95/98 so use - * runtime checks before calling NT specific functions to verify we are - * really running on an NT system. - */ -#define _WIN32_WINNT 0x0400 - -#include <windows.h> -#include <winsock2.h> -#include <mswsock.h> -#include <process.h> -#include <malloc.h> -#include <io.h> -#include <fcntl.h> - -#define PLATFORM "Win32" - -/* - * This file in included in all Apache source code. It contains definitions - * of facilities available on _this_ operating system (HAVE_* macros), - * and prototypes of OS specific functions defined in os.c - */ - -/* temporarily replace crypt */ -/* char *crypt(const char *pw, const char *salt); */ -#define crypt(buf,salt) (buf) - -/* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for - chdir() */ -#include <direct.h> - -#define STATUS -#ifndef STRICT -#define STRICT -#endif -#define CASE_BLIND_FILESYSTEM -#define NO_WRITEV -#define NO_SETSID -#define NO_USE_SIGACTION -#define NO_TIMES -#define NO_GETTIMEOFDAY -#define USE_LONGJMP -#define HAVE_MMAP -#define USE_MMAP_SCOREBOARD -#define MULTITHREAD -#define HAVE_CANONICAL_FILENAME -#define HAVE_DRIVE_LETTERS -#define HAVE_UNC_PATHS -typedef int uid_t; -typedef int gid_t; -typedef int pid_t; -#ifdef _MSC_VER -/* modified to match declaration in sys/stat.h */ -typedef unsigned short mode_t; -#endif -typedef char * caddr_t; - -/* -Define export types. API_EXPORT_NONSTD is a nasty hack to avoid having to declare -every configuration function as __stdcall. -*/ - -#ifdef SHARED_MODULE -#define API_VAR_EXPORT __declspec(dllimport) -#define API_EXPORT(type) __declspec(dllimport) type __stdcall -#define API_EXPORT_NONSTD(type) __declspec(dllimport) type __cdecl -#else -#define API_VAR_EXPORT __declspec(dllexport) -#define API_EXPORT(type) __declspec(dllexport) type __stdcall -#define API_EXPORT_NONSTD(type) __declspec(dllexport) type __cdecl -#endif -#define MODULE_VAR_EXPORT __declspec(dllexport) - -#define strcasecmp(s1, s2) stricmp(s1, s2) -#define strncasecmp(s1, s2, n) strnicmp(s1, s2, n) -#define lstat(x, y) stat(x, y) -#ifndef S_ISLNK -#define S_ISLNK(m) (0) -#endif -#ifndef S_ISREG -#define S_ISREG(m) ((m & _S_IFREG) == _S_IFREG) -#endif -#ifndef S_ISDIR -#define S_ISDIR(m) (((m) & _S_IFDIR) == _S_IFDIR) -#endif -#define STDIN_FILENO 0 -#define STDOUT_FILENO 1 -#define STDERR_FILENO 2 -#define JMP_BUF jmp_buf -#define sleep(t) Sleep(t*1000) -#ifndef O_CREAT -#define O_CREAT _O_CREAT -#endif -#ifndef O_RDWR -#define O_RDWR _O_RDWR -#endif -#define SIGPIPE 17 -/* Seems Windows is not a subgenius */ -#define NO_SLACK -#include <stddef.h> - -#define NO_OTHER_CHILD -#define NO_RELIABLE_PIPED_LOGS - -__inline int ap_os_is_path_absolute(const char *file) -{ - /* For now, just do the same check that http_request.c and mod_alias.c - * do. - */ - return file && (file[0] == '/' || (file[1] == ':' && file[2] == '/')); -} - -#define stat(f,ps) os_stat(f,ps) -API_EXPORT(int) os_stat(const char *szPath,struct stat *pStat); - -API_EXPORT(int) os_strftime(char *s, size_t max, const char *format, const struct tm *tm); - -#define _spawnv(mode,cmdname,argv) os_spawnv(mode,cmdname,argv) -#define spawnv(mode,cmdname,argv) os_spawnv(mode,cmdname,argv) -API_EXPORT(int) os_spawnv(int mode,const char *cmdname,const char *const *argv); -#define _spawnve(mode,cmdname,argv,envp) os_spawnve(mode,cmdname,argv,envp) -#define spawnve(mode,cmdname,argv,envp) os_spawnve(mode,cmdname,argv,envp) -API_EXPORT(int) os_spawnve(int mode,const char *cmdname,const char *const *argv,const char *const *envp); -#define _spawnle os_spawnle -#define spawnle os_spawnle -API_EXPORT_NONSTD(int) os_spawnle(int mode,const char *cmdname,...); - -/* OS-dependent filename routines in util_win32.c */ - -API_EXPORT(int) ap_os_is_filename_valid(const char *file); - -/* Abstractions for dealing with shared object files (DLLs on Win32). - * These are used by mod_so.c - */ -#define ap_os_dso_handle_t HINSTANCE -#define ap_os_dso_init() -#define ap_os_dso_unload(l) FreeLibrary(l) -#define ap_os_dso_sym(h,s) GetProcAddress(h,s) - -API_EXPORT(ap_os_dso_handle_t) ap_os_dso_load(const char *); -API_EXPORT(const char *) ap_os_dso_error(void); - -/* Other ap_os_ routines not used by this platform */ -#define ap_os_kill(pid, sig) kill(pid, sig) - -#endif /* WIN32 */ - -#endif /* ! APACHE_OS_H */ diff --git a/usr.sbin/httpd/src/os/win32/win32/passwd.c b/usr.sbin/httpd/src/os/win32/win32/passwd.c deleted file mode 100644 index abdad710ad1..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/passwd.c +++ /dev/null @@ -1,79 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifdef WIN32 - -#include <stdio.h> -#include <string.h> -#include "passwd.h" - -/* Very tacky implementation */ - -struct passwd *getpwnam(const char *szUser) -{ - static struct passwd pw; - - if(strlen(szUser) > _MAX_PATH-10) - return NULL; - - sprintf(pw.pw_dir,"c:/users/%s",szUser); - - return &pw; -} - -#endif /* WIN32 */
\ No newline at end of file diff --git a/usr.sbin/httpd/src/os/win32/win32/passwd.h b/usr.sbin/httpd/src/os/win32/win32/passwd.h deleted file mode 100644 index bb0e6935e3c..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/passwd.h +++ /dev/null @@ -1,75 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifndef APACHE_PASSWD_H -#define APACHE_PASSWD_H - -#ifdef WIN32 - -#include <stdlib.h> - -struct passwd -{ - char pw_dir[_MAX_PATH]; -}; - -struct passwd *getpwnam(const char *szUser); - -#endif /* WIN32 */ - -#endif /* ndef APACHE_PASSWD_H */ diff --git a/usr.sbin/httpd/src/os/win32/win32/readdir.c b/usr.sbin/httpd/src/os/win32/win32/readdir.c deleted file mode 100644 index 7c823c94532..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/readdir.c +++ /dev/null @@ -1,142 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifdef WIN32 - -#include <malloc.h> -#include <string.h> -#include <errno.h> - -#include "readdir.h" - -/********************************************************************** - * Implement dirent-style opendir/readdir/closedir on Window 95/NT - * - * Functions defined are opendir(), readdir() and closedir() with the - * same prototypes as the normal dirent.h implementation. - * - * Does not implement telldir(), seekdir(), rewinddir() or scandir(). - * The dirent struct is compatible with Unix, except that d_ino is - * always 1 and d_off is made up as we go along. - * - * The DIR typedef is not compatible with Unix. - **********************************************************************/ - -API_EXPORT(DIR *) opendir(const char *dir) -{ - DIR *dp; - char *filespec; - long handle; - int index; - - filespec = malloc(strlen(dir) + 2 + 1); - strcpy(filespec, dir); - index = strlen(filespec) - 1; - if (index >= 0 && (filespec[index] == '/' || filespec[index] == '\\')) - filespec[index] = '\0'; - strcat(filespec, "/*"); - - dp = (DIR *)malloc(sizeof(DIR)); - dp->offset = 0; - dp->finished = 0; - dp->dir = strdup(dir); - - if ((handle = _findfirst(filespec, &(dp->fileinfo))) < 0) { - if (errno == ENOENT) - dp->finished = 1; - else - return NULL; - } - - dp->handle = handle; - free(filespec); - - return dp; -} - -API_EXPORT(struct dirent *) readdir(DIR *dp) -{ - if (!dp || dp->finished) return NULL; - - if (dp->offset != 0) { - if (_findnext(dp->handle, &(dp->fileinfo)) < 0) { - dp->finished = 1; - return NULL; - } - } - dp->offset++; - - strncpy(dp->dent.d_name, dp->fileinfo.name, _MAX_FNAME); - dp->dent.d_ino = 1; - dp->dent.d_reclen = strlen(dp->dent.d_name); - dp->dent.d_off = dp->offset; - - return &(dp->dent); -} - -API_EXPORT(int) closedir(DIR *dp) -{ - if (!dp) return 0; - _findclose(dp->handle); - if (dp->dir) free(dp->dir); - if (dp) free(dp); - - return 0; -} - -#endif /* WIN32 */ diff --git a/usr.sbin/httpd/src/os/win32/win32/readdir.h b/usr.sbin/httpd/src/os/win32/win32/readdir.h deleted file mode 100644 index 153f5da94e2..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/readdir.h +++ /dev/null @@ -1,103 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -/* - * Structures and types used to implement opendir/readdir/closedir - * on Windows 95/NT. - */ - -#ifndef APACHE_READDIR_H -#define APACHE_READDIR_H - -#ifdef WIN32 - -#include <io.h> -#include <stdio.h> -#include <stdlib.h> -#include <sys/types.h> - -#ifndef API_EXPORT -# define API_EXPORT(type) __declspec(dllexport) type __stdcall -#endif - -/* struct dirent - same as Unix */ -struct dirent { - long d_ino; /* inode (always 1 in WIN32) */ - off_t d_off; /* offset to this dirent */ - unsigned short d_reclen; /* length of d_name */ - char d_name[_MAX_FNAME+1]; /* filename (null terminated) */ -}; - -/* typedef DIR - not the same as Unix */ -typedef struct { - long handle; /* _findfirst/_findnext handle */ - short offset; /* offset into directory */ - short finished; /* 1 if there are not more files */ - struct _finddata_t fileinfo; /* from _findfirst/_findnext */ - char *dir; /* the dir we are reading */ - struct dirent dent; /* the dirent to return */ -} DIR; - -/* Function prototypes */ -API_EXPORT(DIR *) opendir(const char *); -API_EXPORT(struct dirent *) readdir(DIR *); -API_EXPORT(int) closedir(DIR *); - -#endif /* WIN32 */ - -#endif /* ndef APACHE_READDIR_H */ diff --git a/usr.sbin/httpd/src/os/win32/win32/registry.c b/usr.sbin/httpd/src/os/win32/win32/registry.c deleted file mode 100644 index 04ba810a810..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/registry.c +++ /dev/null @@ -1,610 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifdef WIN32 -/* - * Functions to handle interacting with the Win32 registry - */ - -/* - * Apache registry key structure - * - * Apache's registry information is stored in the HKEY_LOCAL_MACHINE - * key, under - * - * HKLM\SOFTWARE\Apache Group\Apache\version - * - * These keys are defined in this file. The definition of the "version" part - * will need updating each time Apache moves from beta to non-beta or from a - * release to a development or beta version. - */ - -/* To allow for multiple services, store the configuration file's full path - * under each service entry: - * - * HKLM\System\CurrentControlSet\Services\[service name]\Parameters\ConfPath - * - * The default configuration path (for console apache) is still stored: - * - * HKLM\Software\[Vendor]\[Software]\[Version]\ServerRoot - */ - -#include <windows.h> -#include <stdio.h> - -#include "httpd.h" -#include "http_log.h" - -/* Define where the Apache values are stored in the registry. In general - * VERSION will be the same across all beta releases for a particular - * major release, but will change when the final release is made. - */ - -/* Define where the Apache values are stored in the registry. - * - * If you are looking here to roll the tarball, you didn't need to visit. - * registry.c now picks up the version from include/httpd.h - */ - -#define REGKEY "SOFTWARE\\" SERVER_BASEVENDOR "\\" SERVER_BASEPRODUCT "\\" SERVER_BASEREVISION - -#define SERVICEKEYPRE "System\\CurrentControlSet\\Services\\" -#define SERVICEKEYPOST "\\Parameters" - -/* - * The Windows API registry key functions don't set the last error - * value (the windows equivalent of errno). So we need to set it - * with SetLastError() before calling the aplog_error() function. - * Because this is common, let's have a macro. - */ -#define do_error(rv,fmt,arg) do { \ - SetLastError(rv); \ - ap_log_error(APLOG_MARK, APLOG_WIN32ERROR|APLOG_ERR, NULL, fmt,arg); \ - } while (0); - -/* - * Get the data for registry key value. This is a generic function that - * can either get a value into a caller-supplied buffer, or it can - * allocate space for the value from the pass-in pool. It will normally - * be used by other functions within this file to get specific key values - * (e.g. registry_get_server_root()). This function returns a number of - * different error statuses, allowing the caller to differentiate - * between a key or value not existing and other kinds of errors. Depending - * on the type of data being obtained the caller can then either ignore - * the key-not-existing error, or treat it as a real error. - * - * If ppValue is NULL, allocate space for the value and return it in - * *pValue. The return value is the number of bytes in the value. - * The first argument is the pool to use to allocate space for the value. - * - * If pValue is not NULL, assume it is a buffer of nSizeValue bytes, - * and write the value into the buffer. The return value is the number - * of bytes in the value (so if the return value is greater than - * the supplied nSizeValue, the caller knows that *pValue is truncated). - * The pool argument is ignored. - * - * The return value is the number of bytes in the successfully retreived - * key if everything worked, or: - * - * -1 the key does not exists - * -2 if out of memory during the function - * -3 if the buffer specified by *pValue/nSizeValue was not large enough - * for the value. - * -4 if an error occurred - * - * If the return value is negative a message will be logged to the error - * log (aplog_error) function. If the return value is -2, -3 or -4 the message - * will be logged at priority "error", while if the return value is -1 the - * message will be logged at priority "warning". - */ - -static int ap_registry_get_key_int(pool *p, char *key, char *name, char *pBuffer, int nSizeBuffer, char **ppValue) -{ - long rv; - HKEY hKey; - char *pValue; - int nSize; - int retval; - - rv = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - key, - 0, - KEY_READ, - &hKey); - - if (rv == ERROR_FILE_NOT_FOUND) { - ap_log_error(APLOG_MARK,APLOG_WARNING|APLOG_NOERRNO,NULL, - "Registry does not contain key %s",key); - return -1; - } - if (rv != ERROR_SUCCESS) { - do_error(rv, "RegOpenKeyEx HKLM\\%s",key); - return -4; - } - - if (pBuffer == NULL) { - /* Find the size required for the data by passing NULL as the buffer - * pointer. On return nSize will contain the size required for the - * buffer if the return value is ERROR_SUCCESS. - */ - rv = RegQueryValueEx(hKey, - name, /* key name */ - NULL, /* reserved */ - NULL, /* type */ - NULL, /* for value */ - &nSize); /* for size of "value" */ - - if (rv != ERROR_SUCCESS) { - do_error(rv, "RegQueryValueEx(key %s)", key); - return -1; - } - - pValue = ap_palloc(p, nSize); - *ppValue = pValue; - if (!pValue) { - /* Eek, out of memory, probably not worth trying to carry on, - * but let's give it a go - */ - ap_log_error(APLOG_MARK,APLOG_ERR|APLOG_NOERRNO,NULL, - "Error getting registry key: out of memory"); - return -2; - } - } - else { - /* Get the value into the existing buffer of length nSizeBuffer */ - pValue = pBuffer; - nSize = nSizeBuffer; - } - - rv = RegQueryValueEx(hKey, - name, /* key name */ - NULL, /* reserved */ - NULL, /* type */ - pValue, /* for value */ - &nSize); /* for size of "value" */ - - retval = 0; /* Return value */ - - if (rv == ERROR_FILE_NOT_FOUND) { - ap_log_error(APLOG_MARK,APLOG_WARNING|APLOG_NOERRNO,NULL, - "Registry does not contain value %s\\%s", key, name); - retval = -1; - } - else if (rv == ERROR_MORE_DATA) { - /* This should only happen if we got passed a pre-existing buffer - * (pBuffer, nSizeBuffer). But I suppose it could also happen if we - * allocate a buffer if another process changed the length of the - * value since we found out its length above. Umm. - */ - ap_log_error(APLOG_MARK,APLOG_ERR|APLOG_NOERRNO,NULL, - "Error getting registry value %s: buffer not big enough", key); - retval = -3; - } - else if (rv != ERROR_SUCCESS) { - do_error(rv, "RegQueryValueEx(key %s)", key); - retval = -4; - } - - rv = RegCloseKey(hKey); - if (rv != ERROR_SUCCESS) { - do_error(rv, "RegCloseKey HKLM\\%s", key); - if (retval == 0) { - /* Keep error status from RegQueryValueEx, if any */ - retval = -4; - } - } - - return retval < 0 ? retval : nSize; -} - -/* - * Get the server root from the registry into 'dir' which is - * size bytes long. Returns 0 if the server root was found - * or if the serverroot key does not exist (in which case - * dir will contain an empty string), or -1 if there was - * an error getting the key. - */ - -API_EXPORT(int) ap_registry_get_server_root(pool *p, char *dir, int size) -{ - int rv; - - rv = ap_registry_get_key_int(p, REGKEY, "ServerRoot", dir, size, NULL); - if (rv < 0) { - dir[0] = '\0'; - } - - return (rv < 0) ? -1 : 0; -} - -API_EXPORT(char *) ap_get_service_key(char *display_name) -{ - char *key, *service_name; - - if (display_name == NULL) - return strdup(""); - - service_name = strdup(display_name); - ap_remove_spaces(service_name, display_name); - - key = malloc(strlen(SERVICEKEYPRE) + - strlen(service_name) + - strlen(SERVICEKEYPOST) + 1); - - sprintf(key,"%s%s%s", SERVICEKEYPRE, service_name, SERVICEKEYPOST); - - return(key); -} - -/********************************************************************** - * The rest of this file deals with storing keys or values in the registry - */ - -char *ap_registry_parse_key(int index, char *key) -{ - char *head = key, *skey; - int i; - - if(!key) - return(NULL); - - for(i = 0; i <= index; i++) - { - if(key && key[0] == '\\') - key++; - if (!key) - return(NULL); - head = key; - key = strchr(head, '\\'); - } - - if(!key) - return(strdup(head)); - *key = '\0'; - skey = strdup(head); - *key = '\\'; - return(skey); -} - -/* - * ap_registry_create_apache_key() creates the Apache registry key - * (HLKM\SOFTWARE\Apache Group\Apache\version, as defined at the start - * of this file), if it does not already exist. It will be called by - * ap_registry_store_key_int() if it cannot open this key. This - * function is intended to be called by ap_registry_store_key_int() if - * the Apache key does not exist when it comes to store a data item. - * - * Returns 0 on success or -1 on error. If -1 is returned, the error will - * already have been logged. - */ - -static int ap_registry_create_key(char *longkey) -{ - int index; - HKEY hKey; - HKEY hKeyNext; - int retval; - int rv; - char *key; - - hKey = HKEY_LOCAL_MACHINE; - index = 0; - retval = 0; - - /* Walk the tree, creating at each stage if necessary */ - while (key=ap_registry_parse_key(index,longkey)) { - int result; - - rv = RegCreateKeyEx(hKey, - key, /* subkey */ - 0, /* reserved */ - NULL, /* class */ - REG_OPTION_NON_VOLATILE, - KEY_WRITE, - NULL, - &hKeyNext, - &result); - if (rv != ERROR_SUCCESS) { - do_error(rv, "RegCreateKeyEx(%s)", longkey); - retval = -4; - } - - /* Close the old key */ - rv = RegCloseKey(hKey); - if (rv != ERROR_SUCCESS) { - do_error(rv, "RegCloseKey", NULL); - if (retval == 0) { - /* Keep error status from RegCreateKeyEx, if any */ - retval = -4; - } - } - - if (retval) { - break; - } - - free(key); - hKey = hKeyNext; - index++; - } - - if (!key) { - /* Close the final key we opened, if we walked the entire - * tree - */ - rv = RegCloseKey(hKey); - if (rv != ERROR_SUCCESS) { - do_error(rv, "RegCloseKey", NULL); - if (retval == 0) { - /* Keep error status from RegCreateKeyEx, if any */ - retval = -4; - } - } - } - else - free(key); - - return retval; -} - -/* - * ap_registry_store_key_int() stores a value name and value under the - * Apache registry key. If the Apache key does not exist it is created - * first. This function is intended to be called from a wrapper function - * in this file to set particular data values, such as - * ap_registry_set_server_root() below. - * - * Returns 0 if the value name and data was stored successfully, or - * returns -1 if the Apache key does not exist (since we try to create - * this key, this should never happen), or -4 if any other error occurred - * (these values are consistent with ap_registry_get_key_int()). - * If the return value is negative then the error will already have been - * logged via aplog_error(). - */ - -static int ap_registry_store_key_int(char *key, char *name, DWORD type, void *value, int value_size) -{ - long rv; - HKEY hKey; - int retval; - - rv = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - key, - 0, - KEY_WRITE, - &hKey); - - if (rv == ERROR_FILE_NOT_FOUND) { - /* Key could not be opened -- try to create it - */ - if (ap_registry_create_key(key) < 0) { - /* Creation failed (error already reported) */ - return -4; - } - - /* Now it has been created we should be able to open it - */ - rv = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - key, - 0, - KEY_WRITE, - &hKey); - - if (rv == ERROR_FILE_NOT_FOUND) { - ap_log_error(APLOG_MARK,APLOG_WARNING|APLOG_NOERRNO,NULL, - "Registry does not contain key %s after creation",key); - return -1; - } - } - - if (rv != ERROR_SUCCESS) { - do_error(rv, "RegOpenKeyEx HKLM\\%s", key); - return -4; - } - - /* Now set the value and data */ - rv = RegSetValueEx(hKey, - name, /* value key name */ - 0, /* reserved */ - type, /* type */ - value, /* value data */ - (DWORD)value_size); /* for size of "value" */ - - retval = 0; /* Return value */ - - if (rv != ERROR_SUCCESS) { - do_error(rv, "RegQueryValueEx(key %s)", key); - retval = -4; - } - else { - ap_log_error(APLOG_MARK,APLOG_INFO|APLOG_NOERRNO,NULL, - "Registry stored HKLM\\" REGKEY "\\%s value %s", key, - type == REG_SZ ? value : "(not displayable)"); - } - - /* Make sure we close the key even if there was an error storing - * the data - */ - rv = RegCloseKey(hKey); - if (rv != ERROR_SUCCESS) { - do_error(rv, "RegCloseKey HKLM\\%s", key); - if (retval == 0) { - /* Keep error status from RegQueryValueEx, if any */ - retval = -4; - } - } - - return retval; -} - -/* - * Sets the serverroot value within the registry. Returns 0 on success - * or -1 on error. If -1 is return the error will already have been - * logged via aplog_error(). - */ - -int ap_registry_set_server_root(char *dir) -{ - int rv; - - rv = ap_registry_store_key_int(REGKEY, "ServerRoot", REG_SZ, dir, strlen(dir)+1); - - return rv < 0 ? -1 : 0; -} - -/* Creates and fills array pointed to by parray with the requested registry string - * - * Returns 0 on success, machine specific error code on error - */ -int ap_registry_get_array(pool *p, char *key, char *name, - array_header **pparray) -{ - char *pValue; - char *tmp; - char **newelem; - int ret; - int nSize = 0; - - ret = ap_registry_get_key_int(p, key, name, NULL, 0, &pValue); - if (ret < 0) - return ret; - - tmp = pValue; - if ((ret > 2) && (tmp[0] || tmp[1])) - nSize = 1; /* Element Count */ - while ((tmp < pValue + ret) && (tmp[0] || tmp[1])) - { - if (!tmp[0]) - ++nSize; - ++tmp; - } - - *pparray = ap_make_array(p, nSize, sizeof(char *)); - tmp = pValue; - if (tmp[0] || tmp[1]) { - newelem = (char **) ap_push_array(*pparray); - *newelem = tmp; - } - while ((tmp < pValue + ret) && (tmp[0] || tmp[1])) - { - if (!tmp[0]) { - newelem = (char **) ap_push_array(*pparray); - *newelem = tmp + 1; - } - ++tmp; - } - - return nSize; -} - -int ap_registry_get_service_args(pool *p, int *argc, char ***argv, char *display_name) -{ - int ret; - array_header *parray; - char *key = ap_get_service_key(display_name); - ret = ap_registry_get_array(p, key, "ConfigArgs", &parray); - if (ret > 0) { - *argc = parray->nelts; - *argv = (char**) parray->elts; - } - else { - *argc = 0; - *argv = NULL; - } - free(key); - return ret; -} - -int ap_registry_store_array(pool *p, char *key, char *name, - int nelts, char **elts) -{ - int bufsize, i; - char *buf, *tmp; - - bufsize = 1; /* For trailing second null */ - for (i = 0; i < nelts; ++i) - { - bufsize += strlen(elts[i]) + 1; - } - if (!nelts) - ++bufsize; - - buf = ap_palloc(p, bufsize); - tmp = buf; - for (i = 0; i < nelts; ++i) - { - strcpy(tmp, elts[i]); - tmp += strlen(elts[i]) + 1; - } - if (!nelts) - *(tmp++) = '\0'; - *(tmp++) = '\0'; /* Trailing second null */ - - return ap_registry_store_key_int(key, name, REG_MULTI_SZ, buf, tmp - buf); -} - -int ap_registry_set_service_args(pool *p, int argc, char **argv, char *display_name) -{ - int ret; - char *key = ap_get_service_key(display_name); - ret = ap_registry_store_array(p, key, "ConfigArgs", argc, argv); - free(key); - return ret; -} - -#endif /* WIN32 */
\ No newline at end of file diff --git a/usr.sbin/httpd/src/os/win32/win32/registry.h b/usr.sbin/httpd/src/os/win32/win32/registry.h deleted file mode 100644 index 06155f1f6b8..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/registry.h +++ /dev/null @@ -1,75 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifndef APACHE_REGISTRY_H -#define APACHE_REGISTRY_H - -#ifdef WIN32 - -/* - * Declarations for users of the functions defined in registry.c - */ - -API_EXPORT(int) ap_registry_get_server_root(pool *p, char *dir, int size); -extern int ap_registry_set_server_root(char *dir); -extern int ap_registry_get_service_args(pool *p, int *argc, char ***argv, char *display_name); -extern int ap_registry_set_service_args(pool *p, int argc, char **argv, char *display_name); - -#endif WIN32 - -#endif APACHE_REGISTRY_H
\ No newline at end of file diff --git a/usr.sbin/httpd/src/os/win32/win32/resource.h b/usr.sbin/httpd/src/os/win32/win32/resource.h deleted file mode 100644 index 820bb6aaaff..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/resource.h +++ /dev/null @@ -1,17 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by Apache.rc -// -#define IDI_APACHE 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/usr.sbin/httpd/src/os/win32/win32/service.c b/usr.sbin/httpd/src/os/win32/win32/service.c deleted file mode 100644 index adf4f48652f..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/service.c +++ /dev/null @@ -1,1336 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifdef WIN32 - -#include <windows.h> -#include <stdio.h> -#include <stdlib.h> -#include <process.h> -#include <direct.h> - -#include "httpd.h" -#include "http_conf_globals.h" -#include "http_log.h" -#include "http_main.h" -#include "multithread.h" -#include "service.h" -#include "registry.h" -#include "Win9xConHook.h" - -#define SERVICE_APACHE_RESTART 128 - -static struct -{ - int (*main_fn)(int, char **); - event *stop_event; - int connected; - SERVICE_STATUS_HANDLE hServiceStatus; - char *name; - int exit_status; - SERVICE_STATUS ssStatus; - FILE *logFile; -} globdat; - -/* statics for atexit processing or shared between threads */ -static BOOL die_on_logoff = FALSE; -static HWND console_wnd = NULL; -static int is_service = -1; - -static void WINAPI service_main_fn(DWORD, LPTSTR *); -static void WINAPI service_ctrl(DWORD ctrlCode); -static int ReportStatusToSCMgr(int currentState, int exitCode, int waitHint); -static int ap_start_service(SC_HANDLE, DWORD argc, char **argv); -static int ap_stop_service(SC_HANDLE); -static int ap_restart_service(SC_HANDLE); - -/* exit() for Win32 is macro mapped (horrible, we agree) that allows us - * to catch the non-zero conditions and inform the console process that - * the application died, and hang on to the console a bit longer. - * - * The macro only maps for http_main.c and other sources that include - * the service.h header, so we best assume it's an error to exit from - * _any_ other module. - * - * If real_exit_code is not set to 2, it will not be set or trigger this - * behavior on exit. All service and child processes are expected to - * reset this flag to zero to avoid undesireable side effects. The value - * 1 simply tells the system it is safe to enable the feature (set to 2), - * while 0 prohibits the feature from being enabled. - */ -int real_exit_code = 1; - -void hold_console_open_on_error(void) -{ - HANDLE hConIn; - HANDLE hConErr; - DWORD result; - DWORD mode; - time_t start; - time_t remains; - char *msg = "Note the errors or messages above, " - "and press the <ESC> key to exit. "; - CONSOLE_SCREEN_BUFFER_INFO coninfo; - INPUT_RECORD in; - char count[16]; - - if (!real_exit_code) - return; - hConIn = GetStdHandle(STD_INPUT_HANDLE); - hConErr = GetStdHandle(STD_ERROR_HANDLE); - if ((hConIn == INVALID_HANDLE_VALUE) || (hConErr == INVALID_HANDLE_VALUE)) - return; - if (!WriteConsole(hConErr, msg, strlen(msg), &result, NULL) || !result) - return; - if (!GetConsoleScreenBufferInfo(hConErr, &coninfo)) - return; - if (isWindowsNT()) - mode = ENABLE_MOUSE_INPUT | 0x80; - else - mode = ENABLE_MOUSE_INPUT; - if (!SetConsoleMode(hConIn, mode)) - return; - - start = time(NULL); - do - { - while (PeekConsoleInput(hConIn, &in, 1, &result) && result) - { - if (!ReadConsoleInput(hConIn, &in, 1, &result) || !result) - return; - if ((in.EventType == KEY_EVENT) && in.Event.KeyEvent.bKeyDown - && (in.Event.KeyEvent.uChar.AsciiChar == 27)) - return; - if (in.EventType == MOUSE_EVENT - && (in.Event.MouseEvent.dwEventFlags == DOUBLE_CLICK)) - return; - } - remains = ((start + 30) - time(NULL)); - sprintf (count, "%d...", remains); - if (!SetConsoleCursorPosition(hConErr, coninfo.dwCursorPosition)) - return; - if (!WriteConsole(hConErr, count, strlen(count), &result, NULL) - || !result) - return; - } - while ((remains > 0) && WaitForSingleObject(hConIn, 1000) != WAIT_FAILED); -} - -/* Console Control handler for processing Ctrl-C/Ctrl-Break and - * on Windows NT also user logoff and system shutdown, - * this also used for the Win9x hidden service and child process - */ -static BOOL CALLBACK ap_control_handler(DWORD ctrl_type) -{ - switch (ctrl_type) - { - case CTRL_C_EVENT: - case CTRL_BREAK_EVENT: - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Ctrl+C/Break initiated, shutting down server."); - - real_exit_code = 0; - /* for Interrupt signals, shut down the server. - * Tell the system we have dealt with the signal - * without waiting for Apache to terminate. - */ - ap_start_shutdown(); - return TRUE; - - case CTRL_LOGOFF_EVENT: - if (!die_on_logoff) - return TRUE; - /* or fall through... */ - - case CTRL_CLOSE_EVENT: - case CTRL_SHUTDOWN_EVENT: - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Close/Logoff/Shutdown initiated, shutting down server."); - - /* for Terminate signals, shut down the server. - * Wait for Apache to terminate, but respond - * after a reasonable time to tell the system - * that we have already tried to shut down. - */ - real_exit_code = 0; - fprintf(stderr, "Apache server shutdown initiated...\n"); - ap_start_shutdown(); - Sleep(30000); - return TRUE; - } - - /* We should never get here, but this is (mostly) harmless */ - return FALSE; -} - -/* Once we are running a child process in our tty, it can no longer - * determine which console window is our own, since the window - * reports that it is owned by the child process. - */ -static BOOL CALLBACK EnumttyWindow(HWND wnd, LPARAM retwnd) -{ - char tmp[20], *tty; - if (isWindowsNT()) - tty = "ConsoleWindowClass"; - else - tty = "tty"; - if (GetClassName(wnd, tmp, sizeof(tmp)) && !strcmp(tmp, tty)) - { - DWORD wndproc, thisproc = GetCurrentProcessId(); - GetWindowThreadProcessId(wnd, &wndproc); - if (wndproc == thisproc) { - *((HWND*)retwnd) = wnd; - return FALSE; - } - } - return TRUE; -} - -void stop_child_monitor(void) -{ - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Unhooking the child process monitor for shutdown."); - - FixConsoleCtrlHandler(ap_control_handler, 0); -} - -/* - * The Win32 Apache child cannot loose its console since 16bit cgi - * processes will hang (9x) or fail (NT) if they are not launched - * from a 32bit console app into that app's console window. - * Mark the 9x child as a service process and let the parent process - * clean it up as necessary. - */ -void ap_start_child_console(int is_child_of_service) -{ - int maxwait = 100; - - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Hooking up the child process monitor to watch for shutdown."); - - /* The child is never exactly a service */ - is_service = 0; - - /* Prevent holding open the (hidden) console */ - real_exit_code = 0; - - /* We only die on logoff if we not a service's child */ - die_on_logoff = !is_child_of_service; - - if (isWindowsNT()) { - if (!is_child_of_service) { - /* - * Console mode Apache/WinNT needs to detach from the parent - * console and create and hide it's own console window. - * Not only is logout and shutdown more stable under W2K, - * but this eliminates the mystery 'flicker' that users see - * when invoking CGI apps (e.g. the titlebar or icon of the - * console window changing to the cgi process's identifiers.) - */ - FreeConsole(); - AllocConsole(); - EnumWindows(EnumttyWindow, (long)(&console_wnd)); - if (console_wnd) - ShowWindow(console_wnd, SW_HIDE); - } - /* - * Apache/WinNT installs no child console handler, otherwise - * logoffs interfere with the service's child process! - * The child process must have a later shutdown priority - * than the parent, or the parent cannot shut down the - * child process properly. (The parent's default is 0x280.) - */ - SetProcessShutdownParameters(0x200, 0); - return; - } - - if (!is_child_of_service) { - FreeConsole(); - AllocConsole(); - } - while (!console_wnd && maxwait-- > 0) { - EnumWindows(EnumttyWindow, (long)(&console_wnd)); - Sleep(100); - } - if (console_wnd) { - FixConsoleCtrlHandler(ap_control_handler, die_on_logoff ? 1 : 2); - ShowWindow(console_wnd, SW_HIDE); - atexit(stop_child_monitor); - } -} - - -void stop_console_monitor(void) -{ - /* Remove the control handler at the end of the day. */ - SetConsoleCtrlHandler(ap_control_handler, FALSE); - - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Unhooking the console monitor for shutdown."); - - if (!isWindowsNT()) - FixConsoleCtrlHandler(ap_control_handler, 0); -} - -void ap_start_console_monitor(void) -{ - HANDLE console_input; - - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Hooking up the console monitor to watch for shutdown."); - - die_on_logoff = TRUE; - - is_service = 0; - - console_input = GetStdHandle(STD_INPUT_HANDLE); - /* Assure we properly accept Ctrl+C as an interrupt... - * Win/2000 definately makes some odd assumptions about - * ctrl+c and the reserved console mode bits! - */ - if (console_input != INVALID_HANDLE_VALUE) - { - /* The SetConsoleCtrlHandler(NULL... would fault under Win9x - * WinNT also includes an undocumented 0x80 bit for console mode - * that preserves the console window behavior, and prevents the - * bogus 'selection' mode from being accedently triggered. - */ - if (isWindowsNT()) { - SetConsoleCtrlHandler(NULL, FALSE); - SetConsoleMode(console_input, ENABLE_LINE_INPUT - | ENABLE_ECHO_INPUT - | ENABLE_PROCESSED_INPUT - | 0x80); - } - else { - SetConsoleMode(console_input, ENABLE_LINE_INPUT - | ENABLE_ECHO_INPUT - | ENABLE_PROCESSED_INPUT); - } - } - - if (!isWindowsNT()) - FixConsoleCtrlHandler(ap_control_handler, die_on_logoff ? 1 : 2); - - SetConsoleCtrlHandler(ap_control_handler, TRUE); - - atexit(stop_console_monitor); -} - -void stop_service_monitor(void) -{ - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Unhooking up the service monitor for shutdown."); - - Windows9xServiceCtrlHandler(ap_control_handler, FALSE); -} - -int service95_main(int (*main_fn)(int, char **), int argc, char **argv, - char *display_name) -{ - /* Windows 95/98 */ - char *service_name; - - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Hooking up the service monitor to watch for shutdown."); - - is_service = 1; - die_on_logoff = FALSE; - - /* Set up the Win9x server name, as WinNT would */ - ap_server_argv0 = globdat.name = display_name; - - /* Remove spaces from display name to create service name */ - service_name = strdup(display_name); - ap_remove_spaces(service_name, display_name); - - /* Prevent holding open the (hidden) console */ - real_exit_code = 0; - - Windows9xServiceCtrlHandler(ap_control_handler, service_name); - - atexit(stop_service_monitor); - - /* Run the service */ - globdat.exit_status = main_fn(argc, argv); - - return (globdat.exit_status); -} - -int service_main(int (*main_fn)(int, char **), int argc, char **argv ) -{ - SERVICE_TABLE_ENTRY dispatchTable[] = - { - { "", service_main_fn }, - { NULL, NULL } - }; - - /* Prevent holding open the (nonexistant) console and allow us past - * the first NT service to parse the service's args in apache_main() - */ - ap_server_argv0 = argv[0]; - real_exit_code = 0; - - /* keep the server from going to any real effort, since we know */ - is_service = 1; - - globdat.main_fn = main_fn; - globdat.stop_event = create_event(0, 0, "apache-signal"); - globdat.connected = 1; - - if(!StartServiceCtrlDispatcher(dispatchTable)) - { - /* This is a genuine failure of the SCM. */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Error starting service control dispatcher"); - return(globdat.exit_status); - } - else - { - - return(globdat.exit_status); - } -} - -static HANDLE eventlog_pipewrite = NULL; -static HANDLE eventlog_thread = NULL; - -long __stdcall service_stderr_thread(LPVOID hPipe) -{ - HANDLE hPipeRead = (HANDLE) hPipe; - HANDLE hEventSource; - char errbuf[256]; - char *errmsg = errbuf; - char *errarg[9]; - DWORD errlen = 0; - DWORD errres; - HKEY hk; - - errarg[0] = "The Apache service named"; - errarg[1] = ap_server_argv0; - errarg[2] = "reported the following error:\r\n>>>"; - errarg[3] = errmsg; - errarg[4] = "<<<\r\n before the error.log file could be opened.\r\n"; - errarg[5] = "More information may be available in the error.log file."; - errarg[6] = NULL; - errarg[7] = NULL; - errarg[8] = NULL; - - /* What are we going to do in here, bail on the user? not. */ - if (!RegCreateKey(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services" - "\\EventLog\\Application\\Apache Service", &hk)) - { - /* The stock message file */ - char *netmsgkey = "%SystemRoot%\\System32\\netmsg.dll"; - DWORD dwData = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | - EVENTLOG_INFORMATION_TYPE; - - RegSetValueEx(hk, "EventMessageFile", 0, REG_EXPAND_SZ, - (LPBYTE) netmsgkey, strlen(netmsgkey) + 1); - - RegSetValueEx(hk, "TypesSupported", 0, REG_DWORD, - (LPBYTE) &dwData, sizeof(dwData)); - RegCloseKey(hk); - } - - hEventSource = RegisterEventSource(NULL, "Apache Service"); - - while (ReadFile(hPipeRead, errmsg, 1, &errres, NULL) && (errres == 1)) - { - if ((errmsg > errbuf) || !isspace(*errmsg)) - { - ++errlen; - ++errmsg; - if ((*(errmsg - 1) == '\n') || (errlen == sizeof(errbuf) - 1)) - { - while (errlen && isspace(errbuf[errlen - 1])) - --errlen; - errbuf[errlen] = '\0'; - - /* Generic message: '%1 %2 %3 %4 %5 %6 %7 %8 %9' - * The event code in netmsg.dll is 3299 - */ - ReportEvent(hEventSource, EVENTLOG_ERROR_TYPE, 0, - 3299, NULL, 9, 0, errarg, NULL); - errmsg = errbuf; - errlen = 0; - } - } - } - - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Shut down the Service Error Event Logger."); - - CloseHandle(eventlog_pipewrite); - eventlog_pipewrite = NULL; - - CloseHandle(hPipeRead); - - CloseHandle(eventlog_thread); - eventlog_thread = NULL; - return 0; -} - -static void service_main_fn_terminate(void) -{ - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "The service manager thread is terminating."); - - if (eventlog_pipewrite) - { - CloseHandle(eventlog_pipewrite); - WaitForSingleObject(eventlog_thread, 10000); - eventlog_pipewrite = NULL; - eventlog_pipewrite = NULL; - } - - ReportStatusToSCMgr(SERVICE_STOPPED, NO_ERROR, 0); -} - -void __stdcall service_main_fn(DWORD argc, LPTSTR *argv) -{ - HANDLE hCurrentProcess; - HANDLE hPipeRead = NULL; - HANDLE hPipeReadDup; - DWORD threadid; - SECURITY_ATTRIBUTES sa = {0}; - char **newargv; - - if(!(globdat.hServiceStatus = RegisterServiceCtrlHandler(argv[0], - service_ctrl))) - { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Failure registering service handler"); - return; - } - - ReportStatusToSCMgr( - SERVICE_START_PENDING, // service state - NO_ERROR, // exit code - 3000); // wait hint - - /* Create a pipe to send stderr messages to the system error log */ - hCurrentProcess = GetCurrentProcess(); - if (CreatePipe(&hPipeRead, &eventlog_pipewrite, &sa, 0)) - { - if (DuplicateHandle(hCurrentProcess, hPipeRead, hCurrentProcess, - &hPipeReadDup, 0, FALSE, DUPLICATE_SAME_ACCESS)) - { - CloseHandle(hPipeRead); - hPipeRead = hPipeReadDup; - eventlog_thread = CreateThread(NULL, 0, service_stderr_thread, - (LPVOID) hPipeRead, 0, &threadid); - if (eventlog_thread) - { - int fh; - FILE *fl; - fflush(stderr); - SetStdHandle(STD_ERROR_HANDLE, eventlog_pipewrite); - - fh = _open_osfhandle((long) STD_ERROR_HANDLE, - _O_WRONLY | _O_BINARY); - dup2(fh, STDERR_FILENO); - fl = _fdopen(STDERR_FILENO, "wcb"); - memcpy(stderr, fl, sizeof(FILE)); - } - else - { - CloseHandle(hPipeRead); - CloseHandle(eventlog_pipewrite); - eventlog_pipewrite = NULL; - } - } - else - { - CloseHandle(hPipeRead); - CloseHandle(eventlog_pipewrite); - eventlog_pipewrite = NULL; - } - } - - atexit(service_main_fn_terminate); - - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Hooked up the Service Error Event Logger."); - - /* Fold the "Start Parameters" in with the true executable argv[0], - * and insert a -n tag to pass the service name from the SCM's argv[0] - */ - newargv = (char**) malloc((argc + 3) * sizeof(char*)); - newargv[0] = ap_server_argv0; /* The true executable name */ - newargv[1] = "-n"; /* True service name follows (argv[0]) */ - memcpy (newargv + 2, argv, argc * sizeof(char*)); - newargv[argc + 2] = NULL; /* SCM doesn't null terminate the array */ - argv = newargv; - argc += 2; - - /* Use the name of the service as the error log marker */ - ap_server_argv0 = globdat.name = argv[0]; - - globdat.exit_status = globdat.main_fn( argc, argv ); -} - - -void service_set_status(int status) -{ - ReportStatusToSCMgr(status, NO_ERROR, 3000); -} - - - -// -// FUNCTION: service_ctrl -// -// PURPOSE: This function is called by the SCM whenever -// ControlService() is called on this service. -// -// PARAMETERS: -// dwCtrlCode - type of control requested -// -// RETURN VALUE: -// none -// -// COMMENTS: -// -VOID WINAPI service_ctrl(DWORD dwCtrlCode) -{ - int state; - - state = globdat.ssStatus.dwCurrentState; - switch(dwCtrlCode) - { - // Stop the service. - // - case SERVICE_CONTROL_SHUTDOWN: - case SERVICE_CONTROL_STOP: - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Service Stop/Shutdown signaled, shutting down server."); - state = SERVICE_STOP_PENDING; - ap_start_shutdown(); - break; - - case SERVICE_APACHE_RESTART: - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, NULL, - "Service Restart signaled, shutting down server."); - state = SERVICE_START_PENDING; - ap_start_restart(1); - break; - - // Update the service status. - // - case SERVICE_CONTROL_INTERROGATE: - ReportStatusToSCMgr(state, NO_ERROR, 0); - return; - - // invalid control code - // - default: - return; - - } - - ReportStatusToSCMgr(state, NO_ERROR, 15000); -} - - -int ReportStatusToSCMgr(int currentState, int exitCode, int waitHint) -{ - static int firstTime = 1; - static int checkPoint = 1; - int rv; - - if(firstTime) - { - firstTime = 0; - globdat.ssStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; - globdat.ssStatus.dwServiceSpecificExitCode = 0; - globdat.ssStatus.dwCheckPoint = 1; - } - - if(globdat.connected) - { - if ((currentState == SERVICE_START_PENDING) - || (currentState == SERVICE_STOP_PENDING)) - globdat.ssStatus.dwControlsAccepted = 0; - else - globdat.ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP - | SERVICE_ACCEPT_SHUTDOWN; - - globdat.ssStatus.dwCurrentState = currentState; - globdat.ssStatus.dwWin32ExitCode = exitCode; - if(waitHint) - globdat.ssStatus.dwWaitHint = waitHint; - - if ( ( currentState == SERVICE_RUNNING ) || - ( currentState == SERVICE_STOPPED ) ) - { - globdat.ssStatus.dwWaitHint = 0; - globdat.ssStatus.dwCheckPoint = 0; - } - else - globdat.ssStatus.dwCheckPoint = ++checkPoint; - - rv = SetServiceStatus(globdat.hServiceStatus, &globdat.ssStatus); - - } - return(1); -} - -void InstallService(pool *p, char *display_name, int argc, char **argv, int reconfig) -{ - TCHAR szPath[MAX_PATH]; - TCHAR szQuotedPath[512]; - char *service_name; - int regargc = 0; - char **regargv = malloc((argc + 4) * sizeof(char*)), **newelem = regargv; - - regargc += 4; - *(newelem++) = "-d"; - *(newelem++) = ap_server_root; - *(newelem++) = "-f"; - *(newelem++) = ap_server_confname; - - while (++argv, --argc) { - if ((**argv == '-') && strchr("kndf", argv[0][1])) - --argc, ++argv; /* Skip already handled -k -n -d -f options */ - else if ((**argv != '-') || !strchr("iuw", argv[0][1])) - *(newelem++) = *argv, ++regargc; /* Ignoring -i -u -w options */ - } - - printf(reconfig ? "Reconfiguring the %s service\n" - : "Installing the %s service\n", - display_name); - - if (GetModuleFileName( NULL, szPath, 512 ) == 0) - { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "GetModuleFileName failed"); - return; - } - - /* Remove spaces from display name to create service name */ - service_name = strdup(display_name); - ap_remove_spaces(service_name, display_name); - - if (isWindowsNT()) - { - SC_HANDLE schService; - SC_HANDLE schSCManager; - - ap_snprintf(szQuotedPath, sizeof(szQuotedPath), "\"%s\" --ntservice", szPath); - - schSCManager = OpenSCManager( - NULL, // machine (local) - NULL, // database (default) - SC_MANAGER_ALL_ACCESS // access required - ); - if (!schSCManager) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenSCManager failed"); - return; - } - - /* Added dependencies for the following: TCPIP, AFD - * AFD is the winsock handler, TCPIP is self evident - * - * RPCSS is the Remote Procedure Call (RPC) Locator - * required for DCOM communication. I am far from - * convinced we should toggle this, but be warned that - * future apache modules or ISAPI dll's may depend on it. - */ - if (reconfig) - { - schService = OpenService(schSCManager, service_name, - SERVICE_ALL_ACCESS); - if (!schService) - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenService failed"); - else if (!ChangeServiceConfig( - schService, // Service handle - SERVICE_WIN32_OWN_PROCESS, // service type - SERVICE_AUTO_START, // start type - SERVICE_ERROR_NORMAL, // error control type - szQuotedPath, // service's binary - NULL, // no load ordering group - NULL, // no tag identifier - "Tcpip\0Afd\0", // dependencies - NULL, // user account - NULL, // account password - display_name)) { // service display name - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "ChangeServiceConfig failed"); - /* !schService aborts configuration below */ - CloseServiceHandle(schService); - schService = NULL; - } - } - else /* !reconfig */ - { - schService = CreateService( - schSCManager, // SCManager database - service_name, // name of service - display_name, // name to display - SERVICE_ALL_ACCESS, // desired access - SERVICE_WIN32_OWN_PROCESS, // service type - SERVICE_AUTO_START, // start type - SERVICE_ERROR_NORMAL, // error control type - szQuotedPath, // service's binary - NULL, // no load ordering group - NULL, // no tag identifier - "Tcpip\0Afd\0", // dependencies - NULL, // user account - NULL); // account password - if (!schService) - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "CreateService failed"); - } - if (schService) - CloseServiceHandle(schService); - - CloseServiceHandle(schSCManager); - - if (!schService) - return; - } - else /* !isWindowsNT() */ - { - HKEY hkey; - DWORD rv; - - ap_snprintf(szQuotedPath, sizeof(szQuotedPath), - "\"%s\" -k start -n %s", - szPath, service_name); - /* Create/Find the RunServices key */ - rv = RegCreateKey(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows" - "\\CurrentVersion\\RunServices", &hkey); - if (rv != ERROR_SUCCESS) { - SetLastError(rv); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Could not create/open the RunServices registry key"); - return; - } - - /* Attempt to add the value for our service */ - rv = RegSetValueEx(hkey, service_name, 0, REG_SZ, - (unsigned char *)szQuotedPath, - strlen(szQuotedPath) + 1); - if (rv != ERROR_SUCCESS) { - SetLastError(rv); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Unable to install service: " - "Could not add to RunServices Registry Key"); - RegCloseKey(hkey); - return; - } - - RegCloseKey(hkey); - - /* Create/Find the Service key for Monitor Applications to iterate */ - ap_snprintf(szPath, sizeof(szPath), - "SYSTEM\\CurrentControlSet\\Services\\%s", service_name); - rv = RegCreateKey(HKEY_LOCAL_MACHINE, szPath, &hkey); - if (rv != ERROR_SUCCESS) { - SetLastError(rv); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Could not create/open the %s registry key", szPath); - return; - } - - /* Attempt to add the ImagePath value to identify it as Apache */ - rv = RegSetValueEx(hkey, "ImagePath", 0, REG_SZ, - (unsigned char *)szQuotedPath, - strlen(szQuotedPath) + 1); - if (rv != ERROR_SUCCESS) { - SetLastError(rv); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Unable to install service: " - "Could not add ImagePath to %s Registry Key", - service_name); - RegCloseKey(hkey); - return; - } - - /* Attempt to add the DisplayName value for our service */ - rv = RegSetValueEx(hkey, "DisplayName", 0, REG_SZ, - (unsigned char *)display_name, - strlen(display_name) + 1); - if (rv != ERROR_SUCCESS) { - SetLastError(rv); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Unable to install service: " - "Could not add DisplayName to %s Registry Key", - service_name); - RegCloseKey(hkey); - return; - } - - RegCloseKey(hkey); - } - - /* Both Platforms: Now store the args in the registry */ - if (ap_registry_set_service_args(p, regargc, regargv, service_name)) { - return; - } - - printf("The %s service has been %s successfully.\n", - display_name, reconfig ? "reconfigured" : "installed"); -} - -void RemoveService(char *display_name) -{ - char *service_name; - BOOL success = FALSE; - - printf("Removing the %s service\n", display_name); - - /* Remove spaces from display name to create service name */ - service_name = strdup(display_name); - ap_remove_spaces(service_name, display_name); - - if (isWindowsNT()) - { - SC_HANDLE schService; - SC_HANDLE schSCManager; - - schSCManager = OpenSCManager( - NULL, // machine (NULL == local) - NULL, // database (NULL == default) - SC_MANAGER_ALL_ACCESS // access required - ); - if (!schSCManager) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenSCManager failed"); - return; - } - - schService = OpenService(schSCManager, service_name, SERVICE_ALL_ACCESS); - - if (schService == NULL) { - /* Could not open the service */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenService failed"); - } - else { - /* try to stop the service */ - ap_stop_service(schService); - - // now remove the service - if (DeleteService(schService) == 0) - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "DeleteService failed"); - else - success = TRUE; - CloseServiceHandle(schService); - } - /* SCM removes registry parameters */ - CloseServiceHandle(schSCManager); - } - else /* !isWindowsNT() */ - { - HKEY hkey; - DWORD service_pid; - DWORD rv; - HWND hwnd; - - /* Locate the named window of class ApacheWin95ServiceMonitor - * from the active top level windows - */ - hwnd = FindWindow("ApacheWin95ServiceMonitor", service_name); - if (hwnd && GetWindowThreadProcessId(hwnd, &service_pid)) - { - int ticks = 120; - char prefix[20]; - ap_snprintf(prefix, sizeof(prefix), "ap%ld", (long)service_pid); - setup_signal_names(prefix); - ap_start_shutdown(); - while (--ticks) { - if (!IsWindow(hwnd)) - break; - Sleep(1000); - } - } - - /* Open the RunServices key */ - rv = RegOpenKey(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion\\RunServices", - &hkey); - if (rv != ERROR_SUCCESS) { - SetLastError(rv); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Could not open the RunServices registry key."); - } - else { - /* Delete the registry value for this service */ - rv = RegDeleteValue(hkey, service_name); - if (rv != ERROR_SUCCESS) { - SetLastError(rv); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Unable to remove service: " - "Could not delete the RunServices entry."); - } - else - success = TRUE; - } - RegCloseKey(hkey); - - /* Open the Services key */ - rv = RegOpenKey(HKEY_LOCAL_MACHINE, - "SYSTEM\\CurrentControlSet\\Services", &hkey); - if (rv != ERROR_SUCCESS) { - rv = RegDeleteValue(hkey, service_name); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Could not open the Services registry key."); - success = FALSE; - } - else { - /* Delete the registry key for this service */ - rv = RegDeleteKey(hkey, service_name); - if (rv != ERROR_SUCCESS) { - SetLastError(rv); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "Unable to remove service: " - "Could not delete the Services registry key."); - success = FALSE; - } - } - RegCloseKey(hkey); - } - if (success) - printf("The %s service has been removed successfully.\n", - display_name); -} - -/* - * A hack to determine if we're running as a service without waiting for - * the SCM to fail. - */ - -BOOL isProcessService() -{ - if (is_service != -1) - return is_service; - if (!isWindowsNT() || !AllocConsole()) { - /* Don't assume anything, just yet */ - return FALSE; - } - FreeConsole(); - is_service = 1; - return TRUE; -} - -/* Determine is service_name is a valid service - * - * TODO: be nice if we tested that it is an 'apache' service, no? - */ - -BOOL isValidService(char *display_name) { - char service_key[MAX_PATH]; - char *service_name; - HKEY hkey; - - /* Remove spaces from display name to create service name */ - strcpy(service_key, "System\\CurrentControlSet\\Services\\"); - service_name = strchr(service_key, '\0'); - ap_remove_spaces(service_name, display_name); - - if (RegOpenKey(HKEY_LOCAL_MACHINE, service_key, &hkey) != ERROR_SUCCESS) { - return FALSE; - } - RegCloseKey(hkey); - return TRUE; -} - -BOOL isWindowsNT(void) -{ - static BOOL once = FALSE; - static BOOL isNT = FALSE; - - if (!once) - { - OSVERSIONINFO osver; - osver.dwOSVersionInfoSize = sizeof(osver); - if (GetVersionEx(&osver)) - if (osver.dwPlatformId == VER_PLATFORM_WIN32_NT) - isNT = TRUE; - once = TRUE; - } - return isNT; -} - -int send_signal_to_service(char *display_name, char *sig, - int argc, char **argv) -{ - DWORD service_pid; - HANDLE hwnd; - SC_HANDLE schService; - SC_HANDLE schSCManager; - char *service_name; - int success = FALSE; - - enum { start, restart, stop, unknown } action; - static char *param[] = { "start", "restart", "shutdown" }; - static char *participle[] = { "starting", "restarting", "stopping" }; - static char *past[] = { "started", "restarted", "stopped" }; - - for (action = start; action < unknown; action++) - if (!strcasecmp(sig, param[action])) - break; - - if (action == unknown) { - printf("signal must be start, restart, or shutdown\n"); - return FALSE; - } - - /* Remove spaces from display name to create service name */ - service_name = strdup(display_name); - ap_remove_spaces(service_name, display_name); - - if (isWindowsNT()) - { - schSCManager = OpenSCManager( - NULL, // machine (NULL == local) - NULL, // database (NULL == default) - SC_MANAGER_ALL_ACCESS // access required - ); - if (!schSCManager) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenSCManager failed"); - return FALSE; - } - - schService = OpenService(schSCManager, service_name, SERVICE_ALL_ACCESS); - - if (schService == NULL) { - /* Could not open the service */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "OpenService failed"); - CloseServiceHandle(schSCManager); - return FALSE; - } - - if (!QueryServiceStatus(schService, &globdat.ssStatus)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, NULL, - "QueryService failed"); - CloseServiceHandle(schService); - CloseServiceHandle(schSCManager); - } - } - else /* !isWindowsNT() */ - { - /* Locate the window named service_name of class ApacheWin95ServiceMonitor - * from the active top level windows - */ - hwnd = FindWindow("ApacheWin95ServiceMonitor", service_name); - if (hwnd && GetWindowThreadProcessId(hwnd, &service_pid)) - globdat.ssStatus.dwCurrentState = SERVICE_RUNNING; - else - globdat.ssStatus.dwCurrentState = SERVICE_STOPPED; - } - - if (globdat.ssStatus.dwCurrentState == SERVICE_STOPPED - && action == stop) { - printf("The %s service is not started.\n", display_name); - return FALSE; - } - else if (globdat.ssStatus.dwCurrentState == SERVICE_RUNNING - && action == start) { - printf("The %s service has already been started.\n", display_name); - strcpy(sig, ""); - return FALSE; - } - else - { - printf("The %s service is %s.\n", display_name, participle[action]); - - if (isWindowsNT()) - { - if (action == stop) - success = ap_stop_service(schService); - else if ((action == start) - || ((action == restart) - && (globdat.ssStatus.dwCurrentState - == SERVICE_STOPPED))) - { - /* start NT service needs service args */ - char **args = malloc(argc * sizeof(char*)); - int i, j; - for (i = 1, j = 0; i < argc; i++) { - if ((argv[i][0] == '-') && ((argv[i][1] == 'k') - || (argv[i][1] == 'n'))) - ++i; - else - args[j++] = argv[i]; - } - success = ap_start_service(schService, j, args); - } - else if (action == restart) - success = ap_restart_service(schService); - } - else /* !isWindowsNT()) */ - { - char prefix[20]; - ap_snprintf(prefix, sizeof(prefix), "ap%ld", (long)service_pid); - setup_signal_names(prefix); - - if (action == stop) { - int ticks = 60; - ap_start_shutdown(); - while (--ticks) - { - if (!IsWindow(hwnd)) { - success = TRUE; - break; - } - Sleep(1000); - } - } - else if (action == restart) - { - /* This gets a bit tricky... start and restart (of stopped service) - * will simply fall through and *THIS* process will fade into an - * invisible 'service' process, detaching from the user's console. - * We need to change the restart signal to "start", however, - * if the service was not -yet- running, and we do return FALSE - * to assure main() that we haven't done anything yet. - */ - if (globdat.ssStatus.dwCurrentState == SERVICE_STOPPED) - { - printf("The %s service has %s.\n", display_name, - past[action]); - strcpy(sig, "start"); - return FALSE; - } - - ap_start_restart(1); - success = TRUE; - } - else /* action == start */ - { - printf("The %s service is %s.\n", display_name, - past[action]); - return FALSE; - } - } - - if( success ) - printf("The %s service has %s.\n", display_name, past[action]); - else - printf("Failed to %s the %s service.\n", sig, display_name); - } - - if (isWindowsNT()) { - CloseServiceHandle(schService); - CloseServiceHandle(schSCManager); - } - return success; -} - -int ap_stop_service(SC_HANDLE schService) -{ - if (ControlService(schService, SERVICE_CONTROL_STOP, &globdat.ssStatus)) { - Sleep(1000); - while (QueryServiceStatus(schService, &globdat.ssStatus)) { - if (globdat.ssStatus.dwCurrentState == SERVICE_STOP_PENDING) - Sleep(1000); - else - break; - } - } - if (QueryServiceStatus(schService, &globdat.ssStatus)) - if (globdat.ssStatus.dwCurrentState == SERVICE_STOPPED) - return TRUE; - return FALSE; -} - -int ap_start_service(SC_HANDLE schService, DWORD argc, char **argv) { - if (StartService(schService, argc, argv)) { - Sleep(1000); - while(QueryServiceStatus(schService, &globdat.ssStatus)) { - if(globdat.ssStatus.dwCurrentState == SERVICE_START_PENDING) - Sleep(1000); - else - break; - } - } - if (QueryServiceStatus(schService, &globdat.ssStatus)) - if (globdat.ssStatus.dwCurrentState == SERVICE_RUNNING) - return TRUE; - return FALSE; -} - -int ap_restart_service(SC_HANDLE schService) -{ - int ticks; - if (ControlService(schService, SERVICE_APACHE_RESTART, &globdat.ssStatus)) - { - ticks = 60; - while (globdat.ssStatus.dwCurrentState == SERVICE_START_PENDING) - { - Sleep(1000); - if (!QueryServiceStatus(schService, &globdat.ssStatus)) - return FALSE; - if (!--ticks) - break; - } - } - if (globdat.ssStatus.dwCurrentState == SERVICE_RUNNING) - return TRUE; - return FALSE; -} - -#endif /* WIN32 */ diff --git a/usr.sbin/httpd/src/os/win32/win32/service.h b/usr.sbin/httpd/src/os/win32/win32/service.h deleted file mode 100644 index 93b9d004022..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/service.h +++ /dev/null @@ -1,94 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifndef SERVICE_H -#define SERVICE_H - -#ifdef WIN32 - -/* BIG RED WARNING: exit() is mapped to allow us to capture the exit - * status. This header must only be included from modules linked into - * the ApacheCore.dll - since it's a horrible behavior to exit() from - * any module outside the main() block, and we -will- assume it's a - * fatal error. No dynamically linked module will ever be able to find - * the real_exit_code, and _will_ GP fault if it tries this macro. - */ - -#define exit(status) ((exit)((real_exit_code==2) ? (real_exit_code = (status)) \ - : ((real_exit_code = 0), (status)))) -extern int real_exit_code; -void hold_console_open_on_error(void); - -int service_main(int (*main_fn)(int, char **), int argc, char **argv); -int service95_main(int (*main_fn)(int, char **), int argc, char **argv, - char *display_name); -void service_set_status(int status); -void service_cd(); -BOOL isProcessService(); -BOOL isValidService(char *display_name); -void InstallService(pool *p, char *display_name, int argc, char **argv, int reconfig); -void RemoveService(char *display_name); -int send_signal_to_service(char *display_name, char *sig, - int argc, char **argv); -BOOL isWindowsNT(void); -void ap_start_console_monitor(void); -void ap_start_child_console(int is_child_of_service); - -#endif /* WIN32 */ - -#endif /* SERVICE_H */ diff --git a/usr.sbin/httpd/src/os/win32/win32/util_win32.c b/usr.sbin/httpd/src/os/win32/win32/util_win32.c deleted file mode 100644 index 14b3ec4bcf3..00000000000 --- a/usr.sbin/httpd/src/os/win32/win32/util_win32.c +++ /dev/null @@ -1,830 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifdef WIN32 - -#include <windows.h> -#include <sys/stat.h> -#include <stdarg.h> -#include <time.h> -#include <stdlib.h> - -#include "httpd.h" -#include "http_log.h" - -/* Returns TRUE if the input string is a string - * of one or more '.' characters. - */ -static BOOL OnlyDots(char *pString) -{ - char *c; - - if (*pString == '\0') - return FALSE; - - for (c = pString;*c;c++) - if (*c != '.') - return FALSE; - - return TRUE; -} - -/* Accepts as input a pathname, and tries to match it to an - * existing path and return the pathname in the case that - * is present on the existing path. This routine also - * converts alias names to long names. - */ -API_EXPORT(char *) ap_os_systemcase_filename(pool *pPool, - const char *szFile) -{ - char buf[HUGE_STRING_LEN]; - char *pInputName; - char *p, *q, *t; - BOOL bDone = FALSE; - BOOL bFileExists = TRUE; - HANDLE hFind; - WIN32_FIND_DATA wfd; - - if (!szFile || strlen(szFile) == 0 || strlen(szFile) >= sizeof(buf)) - return ap_pstrdup(pPool, ""); - - t = buf; - pInputName = ap_pstrdup(pPool, szFile); - - /* First convert all slashes to \ so Win32 calls work OK */ - for (p = pInputName; *p; p++) { - if (*p == '/') - *p = '\\'; - } - - q = p = pInputName; - /* If there is drive information, copy it over. */ - if (pInputName[1] == ':') { - /* This is correct - if systemcase is used for - * comparison, d: designations will match - */ - *(t++) = tolower(*p++); - *(t++) = *p++; - q = p; - - /* If all we have is a drive letter, then we are done */ - if (!*p) - bDone = TRUE; - } - - if (*p == '\\') { - ++p; - if (*p == '\\') /* UNC name */ - { - /* Get past the machine name. FindFirstFile */ - /* will not find a machine name only */ - *(t++) = '\\'; - ++q; - p = strchr(p + 1, '\\'); - if (p) - { - p++; - /* Get past the share name. FindFirstFile */ - /* will not find a \\machine\share name only */ - p = strchr(p, '\\'); - if (p) { - /* This was faulty - as of 1.3.13 \\machine\share - * name is now always lowercased - */ - strncpy(t,q,p-q); - strlwr(t); - t += p - q; - q = p; - p++; - } - } - - if (!p) { - bFileExists = FALSE; - p = q; - } - } - } - - p = strchr(p, '\\'); - - while (!bDone) { - if (p) - *p = '\0'; - - if (strchr(q, '*') || strchr(q, '?')) - bFileExists = FALSE; - - /* If the path exists so far, call FindFirstFile - * again. However, if this portion of the path contains - * only '.' charaters, skip the call to FindFirstFile - * since it will convert '.' and '..' to actual names. - * Note: in the call to OnlyDots, we may have to skip - * a leading slash. - */ - if (bFileExists && !OnlyDots((*q == '.' ? q : q+1))) { - hFind = FindFirstFile(pInputName, &wfd); - - if (hFind == INVALID_HANDLE_VALUE) { - bFileExists = FALSE; - } - else { - FindClose(hFind); - - if (*q == '\\') - *(t++) = '\\'; - t = strchr(strcpy(t, wfd.cFileName), '\0'); - } - } - - if (!bFileExists || OnlyDots((*q == '.' ? q : q+1))) { - /* XXX: Comparison could be faulty ...\unknown - * names may not match! - */ - strcpy(t, q); - t = strchr(t, '\0'); - } - - if (p) { - q = p; - *p++ = '\\'; - p = strchr(p, '\\'); - } - else { - bDone = TRUE; - } - } - *t = '\0'; - - /* Finally, convert all slashes to / so server code handles it ok */ - for (p = buf; *p; p++) { - if (*p == '\\') - *p = '/'; - } - - return ap_pstrdup(pPool, buf); -} - - -/* Perform canonicalization with the exception that the - * input case is preserved. - */ -API_EXPORT(char *) ap_os_case_canonical_filename(pool *pPool, - const char *szFile) -{ - char *pNewStr; - char *s; - char *p; - char *q; - - if (szFile == NULL || strlen(szFile) == 0) - return ap_pstrdup(pPool, ""); - - pNewStr = ap_pstrdup(pPool, szFile); - - /* Change all '\' characters to '/' characters. - * While doing this, remove any trailing '.'. - * Also, blow away any directories with 3 or - * more '.' - */ - for (p = pNewStr,s = pNewStr; *s; s++,p++) { - if (*s == '\\' || *s == '/') { - - q = p; - while (p > pNewStr && *(p-1) == '.') - p--; - - if (p == pNewStr && q-p <= 2 && *p == '.') - p = q; - else if (p > pNewStr && p < q && *(p-1) == '/') { - if (q-p > 2) - p--; - else - p = q; - } - - *p = '/'; - } - else { - *p = *s; - } - } - *p = '\0'; - - /* Blow away any final trailing '.' since on Win32 - * foo.bat == foo.bat. == foo.bat... etc. - * Also blow away any trailing spaces since - * "filename" == "filename " - */ - q = p; - while (p > pNewStr && (*(p-1) == '.' || *(p-1) == ' ')) - p--; - if ((p > pNewStr) || - (p == pNewStr && q-p > 2)) - *p = '\0'; - - - /* One more security issue to deal with. Win32 allows - * you to create long filenames. However, alias filenames - * are always created so that the filename will - * conform to 8.3 rules. According to the Microsoft - * Developer's network CD (1/98) - * "Automatically generated aliases are composed of the - * first six characters of the filename plus ~n - * (where n is a number) and the first three characters - * after the last period." - * Here, we attempt to detect and decode these names. - * - * XXX: Netware network clients may have alternate short names, - * simply truncated, with no embedded '~'. Further, this behavior - * can be modified on WinNT volumes. This was not a safe test, - * therefore exclude the '~' pretest. - */ -#ifdef WIN32_SHORT_FILENAME_INSECURE_BEHAVIOR - p = strchr(pNewStr, '~'); - if (p != NULL) -#endif - { - char *pConvertedName, *pQstr, *pPstr; - char buf[HUGE_STRING_LEN]; - /* We potentially have a short name. Call - * ap_os_systemcase_filename to examine the filesystem - * and possibly extract the long name. - */ - pConvertedName = ap_os_systemcase_filename(pPool, pNewStr); - - /* Since we want to preserve the incoming case as much - * as we can, compare for differences in the string and - * only substitute in the path names that changed. - */ - if (stricmp(pNewStr, pConvertedName)) { - buf[0] = '\0'; - - q = pQstr = pConvertedName; - p = pPstr = pNewStr; - do { - q = strchr(q,'/'); - p = strchr(p,'/'); - - if (p != NULL) { - *q = '\0'; - *p = '\0'; - } - - if (stricmp(pQstr, pPstr)) - strcat(buf, pQstr); /* Converted name */ - else - strcat(buf, pPstr); /* Original name */ - - - if (p != NULL) { - pQstr = q; - pPstr = p; - *q++ = '/'; - *p++ = '/'; - } - - } while (p != NULL); - - pNewStr = ap_pstrdup(pPool, buf); - } - } - - return pNewStr; -} - -/* Perform complete canonicalization. - */ -API_EXPORT(char *) ap_os_canonical_filename(pool *pPool, const char *szFile) -{ - char *pNewName; - pNewName = ap_os_case_canonical_filename(pPool, szFile); - strlwr(pNewName); - return pNewName; -} - -/* Win95 doesn't like trailing /s. NT and Unix don't mind. This works - * around the problem. - * Errr... except if it is UNC and we are referring to the root of - * the UNC, we MUST have a trailing \ and we can't use /s. Jeez. - * Not sure if this refers to all UNCs or just roots, - * but I'm going to fix it for all cases for now. (Ben) - */ - -#undef stat -API_EXPORT(int) os_stat(const char *szPath, struct stat *pStat) -{ - int n; - int len = strlen(szPath); - - if ((len == 0) || (len >= MAX_PATH)) { - return -1; - } - - if (szPath[0] == '/' && szPath[1] == '/') { - char buf[_MAX_PATH]; - char *s; - int nSlashes = 0; - - strcpy(buf, szPath); - for (s = buf; *s; ++s) { - if (*s == '/') { - *s = '\\'; - ++nSlashes; - } - } - /* then we need to add one more to get \\machine\share\ */ - if (nSlashes == 3) { - if (++len >= MAX_PATH) { - return -1; - } - *s++ = '\\'; - } - *s = '\0'; - return stat(buf, pStat); - } - - /* - * Below removes the trailing /, however, do not remove - * it in the case of 'x:/' or stat will fail - */ - n = strlen(szPath); - if ((szPath[n - 1] == '\\' || szPath[n - 1] == '/') && - !(n == 3 && szPath[1] == ':')) { - char buf[_MAX_PATH]; - - ap_assert(n < _MAX_PATH); - strcpy(buf, szPath); - buf[n - 1] = '\0'; - - return stat(buf, pStat); - } - return stat(szPath, pStat); -} - -/* Fix two really crap problems with Win32 spawn[lv]e*: - * - * 1. Win32 doesn't deal with spaces in argv. - * 2. Win95 doesn't like / in cmdname. - */ - -#undef _spawnv -API_EXPORT(int) os_spawnv(int mode, const char *cmdname, - const char *const *argv) -{ - int n; - char **aszArgs; - const char *szArg; - char *szCmd; - char *s; - - szCmd = _alloca(strlen(cmdname)+1); - strcpy(szCmd, cmdname); - for (s = szCmd; *s; ++s) { - if (*s == '/') { - *s = '\\'; - } - } - - for (n = 0; argv[n]; ++n) - ; - - aszArgs = _alloca((n + 1) * sizeof(const char *)); - - for (n = 0; szArg = argv[n]; ++n) { - if (strchr(szArg, ' ')) { - int l = strlen(szArg); - - aszArgs[n] = _alloca(l + 2 + 1); - aszArgs[n][0] = '"'; - strcpy(&aszArgs[n][1], szArg); - aszArgs[n][l + 1] = '"'; - aszArgs[n][l + 2] = '\0'; - } - else { - aszArgs[n] = (char *)szArg; - } - } - - aszArgs[n] = NULL; - - return _spawnv(mode, szCmd, aszArgs); -} - -#undef _spawnve -API_EXPORT(int) os_spawnve(int mode, const char *cmdname, - const char *const *argv, const char *const *envp) -{ - int n; - char **aszArgs; - const char *szArg; - char *szCmd; - char *s; - - szCmd = _alloca(strlen(cmdname)+1); - strcpy(szCmd, cmdname); - for (s = szCmd; *s; ++s) { - if (*s == '/') { - *s = '\\'; - } - } - - for (n = 0; argv[n]; ++n) - ; - - aszArgs = _alloca((n + 1)*sizeof(const char *)); - - for (n = 0; szArg = argv[n]; ++n){ - if (strchr(szArg, ' ')) { - int l = strlen(szArg); - - aszArgs[n] = _alloca(l + 2 + 1); - aszArgs[n][0] = '"'; - strcpy(&aszArgs[n][1], szArg); - aszArgs[n][l + 1] = '"'; - aszArgs[n][l + 2] = '\0'; - } - else { - aszArgs[n] = (char *)szArg; - } - } - - aszArgs[n] = NULL; - - return _spawnve(mode, szCmd, aszArgs, envp); -} - -API_EXPORT_NONSTD(int) os_spawnle(int mode, const char *cmdname, ...) -{ - int n; - va_list vlist; - char **aszArgs; - const char *szArg; - const char *const *aszEnv; - char *szCmd; - char *s; - - szCmd = _alloca(strlen(cmdname)+1); - strcpy(szCmd, cmdname); - for (s = szCmd; *s; ++s) { - if (*s == '/') { - *s = '\\'; - } - } - - va_start(vlist, cmdname); - for (n = 0; va_arg(vlist, const char *); ++n) - ; - va_end(vlist); - - aszArgs = _alloca((n + 1) * sizeof(const char *)); - - va_start(vlist, cmdname); - for (n = 0; szArg = va_arg(vlist, const char *); ++n) { - if (strchr(szArg, ' ')) { - int l = strlen(szArg); - - aszArgs[n] = _alloca(l + 2 + 1); - aszArgs[n][0] = '"'; - strcpy(&aszArgs[n][1], szArg); - aszArgs[n][l + 1] = '"'; - aszArgs[n][l + 2] = '\0'; - } - else { - aszArgs[n] = (char *)szArg; - } - } - - aszArgs[n] = NULL; - - aszEnv = va_arg(vlist, const char *const *); - va_end(vlist); - - return _spawnve(mode, szCmd, aszArgs, aszEnv); -} - -#undef strftime - -/* Partial replacement for strftime. This adds certain expandos to the - * Windows version - */ - -API_EXPORT(int) os_strftime(char *s, size_t max, const char *format, - const struct tm *tm) { - /* If the new format string is bigger than max, the result string probably - * won't fit anyway. When %-expandos are added, made sure the padding below - * is enough. - */ - char *new_format = (char *) _alloca(max + 11); - size_t i, j, format_length = strlen(format); - int return_value; - int length_written; - - for (i = 0, j = 0; (i < format_length && j < max);) { - if (format[i] != '%') { - new_format[j++] = format[i++]; - continue; - } - switch (format[i+1]) { - case 'D': - /* Is this locale dependent? Shouldn't be... - Also note the year 2000 exposure here */ - memcpy(new_format + j, "%m/%d/%y", 8); - i += 2; - j += 8; - break; - case 'r': - memcpy(new_format + j, "%I:%M:%S %p", 11); - i += 2; - j += 11; - break; - case 'T': - memcpy(new_format + j, "%H:%M:%S", 8); - i += 2; - j += 8; - break; - case 'e': - length_written = ap_snprintf(new_format + j, max - j, "%2d", - tm->tm_mday); - j = (length_written == -1) ? max : (j + length_written); - i += 2; - break; - default: - /* We know we can advance two characters forward here. */ - new_format[j++] = format[i++]; - new_format[j++] = format[i++]; - } - } - if (j >= max) { - *s = '\0'; /* Defensive programming, okay since output is undefined */ - return_value = 0; - } else { - new_format[j] = '\0'; - return_value = strftime(s, max, new_format, tm); - } - return return_value; -} - -/* - * ap_os_is_filename_valid is given a filename, and returns 0 if the filename - * is not valid for use on this system. On Windows, this means it fails any - * of the tests below. Otherwise returns 1. - * - * Test for filename validity on Win32. This is of tests come in part from - * the MSDN article at "Technical Articles, Windows Platform, Base Services, - * Guidelines, Making Room for Long Filenames" although the information - * in MSDN about filename testing is incomplete or conflicting. There is a - * similar set of tests in "Technical Articles, Windows Platform, Base Services, - * Guidelines, Moving Unix Applications to Windows NT". - * - * The tests are: - * - * 1) total path length greater than MAX_PATH - * - * 2) anything using the octets 0-31 or characters " < > | : - * (these are reserved for Windows use in filenames. In addition - * each file system has its own additional characters that are - * invalid. See KB article Q100108 for more details). - * - * 3) anything ending in "." (no matter how many) - * (filename doc, doc. and doc... all refer to the same file) - * - * 4) any segment in which the basename (before first period) matches - * one of the DOS device names - * (the list comes from KB article Q100108 although some people - * reports that additional names such as "COM5" are also special - * devices). - * - * If the path fails ANY of these tests, the result must be to deny access. - */ - -API_EXPORT(int) ap_os_is_filename_valid(const char *file) -{ - const char *segstart; - unsigned int seglength; - const char *pos; - static const char * const invalid_characters = "?\"<>*|:"; - static const char * const invalid_filenames[] = { - "CON", "AUX", "COM1", "COM2", "COM3", - "COM4", "LPT1", "LPT2", "LPT3", "PRN", "NUL", NULL - }; - - /* Test 1 */ - if (strlen(file) >= MAX_PATH) { - /* Path too long for Windows. Note that this test is not valid - * if the path starts with //?/ or \\?\. */ - return 0; - } - - pos = file; - - /* Skip any leading non-path components. This can be either a - * drive letter such as C:, or a UNC path such as \\SERVER\SHARE\. - * We continue and check the rest of the path based on the rules above. - * This means we could eliminate valid filenames from servers which - * are not running NT (such as Samba). - */ - - if (pos[0] && pos[1] == ':') { - /* Skip leading drive letter */ - pos += 2; - } - else { - if ((pos[0] == '\\' || pos[0] == '/') && - (pos[1] == '\\' || pos[1] == '/')) { - /* Is a UNC, so skip the server name and share name */ - pos += 2; - while (*pos && *pos != '/' && *pos != '\\') - pos++; - if (!*pos) { - /* No share name */ - return 0; - } - pos++; /* Move to start of share name */ - while (*pos && *pos != '/' && *pos != '\\') - pos++; - if (!*pos) { - /* No path information */ - return 0; - } - } - } - - while (*pos) { - unsigned int idx; - unsigned int baselength; - - while (*pos == '/' || *pos == '\\') { - pos++; - } - if (*pos == '\0') { - break; - } - segstart = pos; /* start of segment */ - while (*pos && *pos != '/' && *pos != '\\') { - pos++; - } - seglength = pos - segstart; - /* - * Now we have a segment of the path, starting at position "segstart" - * and length "seglength" - */ - - /* Test 2 */ - for (idx = 0; idx < seglength; idx++) { - if ((segstart[idx] > 0 && segstart[idx] < 32) || - strchr(invalid_characters, segstart[idx])) { - return 0; - } - } - - /* Test 3 */ - if (segstart[seglength-1] == '.') { - return 0; - } - - /* Test 4 */ - for (baselength = 0; baselength < seglength; baselength++) { - if (segstart[baselength] == '.') { - break; - } - } - - /* baselength is the number of characters in the base path of - * the segment (which could be the same as the whole segment length, - * if it does not include any dot characters). */ - if (baselength == 3 || baselength == 4) { - for (idx = 0; invalid_filenames[idx]; idx++) { - if (strlen(invalid_filenames[idx]) == baselength && - !strnicmp(invalid_filenames[idx], segstart, baselength)) { - return 0; - } - } - } - } - - return 1; -} - - -API_EXPORT(ap_os_dso_handle_t) ap_os_dso_load(const char *module_name) -{ - UINT em; - ap_os_dso_handle_t dsoh; - char path[MAX_PATH], *p; - /* Load the module... - * per PR2555, the LoadLibraryEx function is very picky about slashes. - * Debugging on NT 4 SP 6a reveals First Chance Exception within NTDLL. - * LoadLibrary in the MS PSDK also reveals that it -explicitly- states - * that backslashes must be used. - * - * Transpose '\' for '/' in the filename. - */ - ap_cpystrn(path, module_name, MAX_PATH); - p = path; - while (p = strchr(p, '/')) - *p = '\\'; - - /* First assume the dso/dll's required by -this- dso are sitting in the - * same path or can be found in the usual places. Failing that, let's - * let that dso look in the apache root. - */ - em = SetErrorMode(SEM_FAILCRITICALERRORS); - dsoh = LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - if (!dsoh) { - dsoh = LoadLibraryEx(path, NULL, 0); - } - SetErrorMode(em); - return dsoh; -} - -API_EXPORT(const char *) ap_os_dso_error(void) -{ - int len, nErrorCode; - static char errstr[120]; - /* This is -not- threadsafe code, but it's about the best we can do. - * mostly a potential problem for isapi modules, since LoadModule - * errors are handled within a single config thread. - */ - - nErrorCode = GetLastError(); - len = ap_snprintf(errstr, sizeof(errstr), "(%d) ", nErrorCode); - - len += FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - nErrorCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPTSTR) errstr + len, - sizeof(errstr) - len, - NULL - ); - /* FormatMessage may have appended a newline (\r\n). So remove it - * and use ": " instead like the Unix errors. The error may also - * end with a . before the return - if so, trash it. - */ - if (len > 1 && errstr[len-2] == '\r' && errstr[len-1] == '\n') { - if (len > 2 && errstr[len-3] == '.') - len--; - errstr[len-2] = ':'; - errstr[len-1] = ' '; - } - return errstr; -} - -#endif /* WIN32 */
\ No newline at end of file |