You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@hyperreal.org on 1999/08/28 00:57:42 UTC
cvs commit: apache-2.0/src/os/win32 modules.c os.c os.h
stoddard 99/08/27 15:57:37
Modified: src ApacheCore.def ApacheCore.dsp ApacheCore.mak
Makefile.nt
src/ap ap.dsp ap.mak
src/include ap_config.h
src/main alloc.c http_main.c
src/modules/mpm/winnt winnt.c
src/os/win32 modules.c os.c os.h
Log:
A bunch of changes to get the server compiling on WIN32. mod_cgi, mod_include,
mod_isapi and mod_so don't work so I am not making them. Moved a lot of code out
of multithread.* and into os.* (didn't want to add multithread to the new repository).
Much of this can be cleaned up when APR is stable.
And Dean's gonna but me for sure for the http_main hit. It's may be
possible to name a DLL entry point 'main()'. Just havent tried it yet.
Enjoy!
Revision Changes Path
1.2 +47 -44 apache-2.0/src/ApacheCore.def
Index: ApacheCore.def
===================================================================
RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheCore.def 1999/08/24 05:34:13 1.1
+++ ApacheCore.def 1999/08/27 22:56:35 1.2
@@ -16,7 +16,7 @@
ap_add_named_module @9
ap_add_per_dir_conf @10
ap_add_per_url_conf @11
- ap_add_version_component @12
+ ;ap_add_version_component @12
ap_allow_options @13
ap_allow_overrides @14
ap_append_arrays @15
@@ -27,34 +27,34 @@
ap_bclose @20
ap_bcreate @21
ap_bfilbuf @22
- ap_bfileno @23
+ ;ap_bfileno @23
ap_bflsbuf @24
ap_bflush @25
ap_bgetopt @26
ap_bgets @27
- ap_bhalfduplex @28
- ap_block_alarms @29
+ ;ap_bhalfduplex @28
+ ;ap_block_alarms @29
ap_blookc @30
- ap_bnonblock @31
+ ;ap_bnonblock @31
ap_bonerror @32
- ap_bpushfd @33
- ap_bpushh @34
+ ;ap_bpushfd @33
+ ;ap_bpushh @34
ap_bputs @35
ap_bread @36
ap_bsetflag @37
ap_bsetopt @38
- ap_bskiplf @39
+ ;ap_bskiplf @39
ap_bspawn_child @40
ap_bwrite @41
- ap_bytes_in_free_blocks @42
- ap_bytes_in_pool @43
+ ;ap_bytes_in_free_blocks @42
+ ;ap_bytes_in_pool @43
ap_call_exec @44
- ap_can_exec @45
+ ;ap_can_exec @45
ap_cfg_closefile @46
ap_cfg_getc @47
ap_cfg_getline @48
ap_chdir_file @49
- ap_check_alarm @50
+ ;ap_check_alarm @50
ap_check_cmd_context @51
ap_checkmask @52
ap_cleanup_for_exec @53
@@ -89,7 +89,7 @@
ap_escape_path_segment @82
ap_escape_quotes @83
ap_escape_shell_cmd @84
- ap_exists_scoreboard_image @85
+ ;ap_exists_scoreboard_image @85
ap_finalize_request_protocol @86
ap_find_command @87
ap_find_command_in_modules @88
@@ -107,7 +107,7 @@
ap_get_server_built @100
ap_get_server_name @101
ap_get_server_port @102
- ap_get_server_version @103
+ ;ap_get_server_version @103
ap_get_time @104
ap_get_token @105
ap_getparents @106
@@ -122,7 +122,7 @@
ap_gm_timestr_822 @115
ap_gname2id @116
ap_handle_command @117
- ap_hard_timeout @118
+ ;ap_hard_timeout @118
ap_ht_time @119
ap_ind @120
ap_index_of_response @121
@@ -137,7 +137,7 @@
ap_kill_cleanup @130
ap_kill_cleanups_for_fd @131
ap_kill_cleanups_for_socket @132
- ap_kill_timeout @133
+ ;ap_kill_timeout @133
ap_log_assert @134
ap_log_error_old @135
ap_log_reason @136
@@ -204,7 +204,7 @@
ap_remove_loaded_module @197
ap_remove_module @198
ap_requires @199
- ap_reset_timeout @200
+ ;ap_reset_timeout @200
ap_rflush @201
ap_rind @202
ap_rputc @203
@@ -216,8 +216,8 @@
ap_scan_script_header_err @209
ap_scan_script_header_err_buff @210
ap_scan_script_header_err_core @211
- ap_send_fb @212
- ap_send_fb_length @213
+ ;ap_send_fb @212
+ ;ap_send_fb_length @213
ap_send_fd @214
ap_send_fd_length @215
ap_send_http_header @216
@@ -232,7 +232,7 @@
ap_set_last_modified @225
ap_setup_client_block @226
ap_should_client_block @227
- ap_soft_timeout @228
+ ;ap_soft_timeout @228
ap_some_auth_required @229
ap_spawn_child @230
ap_srm_command_loop @231
@@ -241,7 +241,7 @@
ap_strcmp_match @234
ap_sub_req_lookup_file @235
ap_sub_req_lookup_uri @236
- ap_sync_scoreboard_image @237
+ ;ap_sync_scoreboard_image @237
ap_table_add @238
ap_table_addn @239
ap_table_get @240
@@ -252,7 +252,7 @@
ap_table_unset @245
ap_tm2sec @246
ap_uname2id @247
- ap_unblock_alarms @248
+ ;ap_unblock_alarms @248
ap_unescape_url @249
ap_unparse_uri_components @250
ap_update_mtime @251
@@ -275,7 +275,7 @@
ap_bprintf @268
ap_bvputs @269
ap_day_snames @270
- ap_extended_status @271
+ ;ap_extended_status @271
ap_limit_section @272
ap_loaded_modules @273
ap_log_error @274
@@ -285,10 +285,10 @@
ap_null_cleanup @278
ap_psprintf @279
ap_pstrcat @280
- ap_restart_time @281
+ ;ap_restart_time @281
ap_rprintf @282
ap_rvputs @283
- ap_scoreboard_image @284
+ ;ap_scoreboard_image @284
ap_send_header_field @285
ap_server_argv0 @286
ap_server_root @287
@@ -297,24 +297,24 @@
ap_set_string_slot @290
ap_set_string_slot_lower @291
ap_snprintf @292
- ap_suexec_enabled @293
+ ;ap_suexec_enabled @293
ap_table_do @294
apache_main @295
asis_module @296
auth_module @297
autoindex_module @298
- cgi_module @299
+ ;cgi_module @299
config_log_module @300
core_module @301
dir_module @302
env_module @303
imap_module @304
- includes_module @305
+ ;includes_module @305
mime_module @306
negotiation_module @307
os_spawnle @308
setenvif_module @309
- so_module @310
+ ;so_module @310
top_module @311
ap_fnmatch @312
ap_method_number_of @313
@@ -328,20 +328,20 @@
ap_validate_password @322
ap_size_list_item @323
ap_get_list_item @324
- ap_scoreboard_fname @325
- ap_pid_fname @326
- ap_excess_requests_per_child @327
- ap_threads_per_child @328
- ap_max_requests_per_child @329
- ap_daemons_to_start @330
- ap_daemons_min_free @331
- ap_daemons_max_free @332
- ap_daemons_limit @333
- ap_user_name @334
- ap_user_id @335
- ap_group_id @336
- ap_standalone @337
- ap_server_confname @338
+ ;ap_scoreboard_fname @325
+ ;ap_pid_fname @326
+ ;ap_excess_requests_per_child @327
+ ;ap_threads_per_child @328
+ ;ap_max_requests_per_child @329
+ ;ap_daemons_to_start @330
+ ;ap_daemons_min_free @331
+ ;ap_daemons_max_free @332
+ ;ap_daemons_limit @333
+ ;ap_user_name @334
+ ;ap_user_id @335
+ ;ap_group_id @336
+ ;ap_standalone @337
+ ;ap_server_confname @338
ap_sub_req_method_uri @339
ap_regerror @341
ap_regexec @342
@@ -359,4 +359,7 @@
ap_SHA1Update @354
ap_SHA1Final @355
ap_sha1_base64 @356
-
+ ap_show_hook @357
+ ap_hook_sort_register @358
+ ap_hook_process_connection @359
+ ap_process_http_connection @360
1.2 +43 -31 apache-2.0/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheCore.dsp 1999/08/24 05:34:13 1.1
+++ ApacheCore.dsp 1999/08/27 22:56:36 1.2
@@ -54,7 +54,7 @@
# 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 os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
@@ -80,7 +80,7 @@
# 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
-# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386
# SUBTRACT LINK32 /map
!ENDIF
@@ -118,6 +118,10 @@
# End Source File
# Begin Source File
+SOURCE=.\main\http_connection.c
+# End Source File
+# Begin Source File
+
SOURCE=.\main\http_core.c
# End Source File
# Begin Source File
@@ -142,6 +146,14 @@
# End Source File
# Begin Source File
+SOURCE=.\os\win32\iol_socket.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\main\listen.c
+# End Source File
+# Begin Source File
+
SOURCE=.\modules\standard\mod_access.c
# End Source File
# Begin Source File
@@ -166,10 +178,6 @@
# End Source File
# Begin Source File
-SOURCE=.\modules\standard\mod_cgi.c
-# End Source File
-# Begin Source File
-
SOURCE=.\modules\standard\mod_dir.c
# End Source File
# Begin Source File
@@ -182,14 +190,6 @@
# End Source File
# Begin Source File
-SOURCE=.\modules\standard\mod_include.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\os\win32\mod_isapi.c
-# End Source File
-# Begin Source File
-
SOURCE=.\modules\standard\mod_log_config.c
# End Source File
# Begin Source File
@@ -206,10 +206,6 @@
# End Source File
# Begin Source File
-SOURCE=.\modules\standard\mod_so.c
-# End Source File
-# Begin Source File
-
SOURCE=.\modules\standard\mod_userdir.c
# End Source File
# Begin Source File
@@ -218,10 +214,6 @@
# End Source File
# Begin Source File
-SOURCE=.\os\win32\multithread.c
-# End Source File
-# Begin Source File
-
SOURCE=.\os\win32\readdir.c
# End Source File
# Begin Source File
@@ -234,10 +226,6 @@
# End Source File
# Begin Source File
-SOURCE=.\os\win32\service.c
-# End Source File
-# Begin Source File
-
SOURCE=.\main\util.c
# End Source File
# Begin Source File
@@ -260,6 +248,10 @@
SOURCE=.\os\win32\util_win32.c
# End Source File
+# Begin Source File
+
+SOURCE=.\modules\mpm\winnt\winnt.c
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -274,6 +266,18 @@
# End Source File
# Begin Source File
+SOURCE=.\include\ap_hooks.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\ap_iol.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\ap_listen.h
+# End Source File
+# Begin Source File
+
SOURCE=.\include\ap_md5.h
# End Source File
# Begin Source File
@@ -310,6 +314,10 @@
# End Source File
# Begin Source File
+SOURCE=.\include\http_connection.h
+# End Source File
+# Begin Source File
+
SOURCE=.\include\http_core.h
# End Source File
# Begin Source File
@@ -338,11 +346,15 @@
# End Source File
# Begin Source File
+SOURCE=.\os\win32\iol_socket.h
+# End Source File
+# Begin Source File
+
SOURCE=.\modules\standard\mod_mime.h
# End Source File
# Begin Source File
-SOURCE=.\include\multithread.h
+SOURCE=.\modules\mpm\winnt\mpm_default.h
# End Source File
# Begin Source File
@@ -362,10 +374,6 @@
# End Source File
# Begin Source File
-SOURCE=.\include\scoreboard.h
-# End Source File
-# Begin Source File
-
SOURCE=.\os\win32\service.h
# End Source File
# Begin Source File
@@ -383,6 +391,10 @@
# Begin Source File
SOURCE=.\include\util_uri.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\modules\mpm\winnt\winnt.h
# End Source File
# End Group
# Begin Group "Resource Files"
1.3 +874 -561 apache-2.0/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/ApacheCore.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApacheCore.mak 1999/08/26 05:59:28 1.2
+++ ApacheCore.mak 1999/08/27 22:56:37 1.3
@@ -28,6 +28,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "ApacheCore - Win32 Release"
OUTDIR=.\CoreR
@@ -52,37 +56,33 @@
-@erase "$(INTDIR)\buildmark.obj"
-@erase "$(INTDIR)\getopt.obj"
-@erase "$(INTDIR)\http_config.obj"
+ -@erase "$(INTDIR)\http_connection.obj"
-@erase "$(INTDIR)\http_core.obj"
-@erase "$(INTDIR)\http_log.obj"
-@erase "$(INTDIR)\http_main.obj"
-@erase "$(INTDIR)\http_protocol.obj"
-@erase "$(INTDIR)\http_request.obj"
-@erase "$(INTDIR)\http_vhost.obj"
- -@erase "$(INTDIR)\md5c.obj"
+ -@erase "$(INTDIR)\iol_socket.obj"
+ -@erase "$(INTDIR)\listen.obj"
-@erase "$(INTDIR)\mod_access.obj"
-@erase "$(INTDIR)\mod_actions.obj"
-@erase "$(INTDIR)\mod_alias.obj"
-@erase "$(INTDIR)\mod_asis.obj"
-@erase "$(INTDIR)\mod_auth.obj"
-@erase "$(INTDIR)\mod_autoindex.obj"
- -@erase "$(INTDIR)\mod_cgi.obj"
-@erase "$(INTDIR)\mod_dir.obj"
-@erase "$(INTDIR)\mod_env.obj"
-@erase "$(INTDIR)\mod_imap.obj"
- -@erase "$(INTDIR)\mod_include.obj"
- -@erase "$(INTDIR)\mod_isapi.obj"
-@erase "$(INTDIR)\mod_log_config.obj"
-@erase "$(INTDIR)\mod_mime.obj"
-@erase "$(INTDIR)\mod_negotiation.obj"
-@erase "$(INTDIR)\mod_setenvif.obj"
- -@erase "$(INTDIR)\mod_so.obj"
-@erase "$(INTDIR)\mod_userdir.obj"
-@erase "$(INTDIR)\modules.obj"
- -@erase "$(INTDIR)\multithread.obj"
-@erase "$(INTDIR)\readdir.obj"
-@erase "$(INTDIR)\registry.obj"
-@erase "$(INTDIR)\rfc1413.obj"
- -@erase "$(INTDIR)\service.obj"
-@erase "$(INTDIR)\util.obj"
-@erase "$(INTDIR)\util_date.obj"
-@erase "$(INTDIR)\util_md5.obj"
@@ -90,6 +90,7 @@
-@erase "$(INTDIR)\util_uri.obj"
-@erase "$(INTDIR)\util_win32.obj"
-@erase "$(INTDIR)\vc50.idb"
+ -@erase "$(INTDIR)\winnt.obj"
-@erase "$(OUTDIR)\ApacheCore.dll"
-@erase "$(OUTDIR)\ApacheCore.exp"
-@erase "$(OUTDIR)\ApacheCore.lib"
@@ -97,46 +98,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
- /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /D "NDEBUG" /D "WIN32" /D\
+ "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fp"$(INTDIR)\ApacheCore.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreR/
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)\ApacheCore.bsc"
BSC32_SBRS= \
@@ -144,7 +111,7 @@
LINK32=link.exe
LINK32_FLAGS=os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib\
ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll\
+ advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll\
/incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386\
/def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
/implib:"$(OUTDIR)\ApacheCore.lib"
@@ -156,43 +123,40 @@
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\getopt.obj" \
"$(INTDIR)\http_config.obj" \
+ "$(INTDIR)\http_connection.obj" \
"$(INTDIR)\http_core.obj" \
"$(INTDIR)\http_log.obj" \
"$(INTDIR)\http_main.obj" \
"$(INTDIR)\http_protocol.obj" \
"$(INTDIR)\http_request.obj" \
"$(INTDIR)\http_vhost.obj" \
- "$(INTDIR)\md5c.obj" \
+ "$(INTDIR)\iol_socket.obj" \
+ "$(INTDIR)\listen.obj" \
"$(INTDIR)\mod_access.obj" \
"$(INTDIR)\mod_actions.obj" \
"$(INTDIR)\mod_alias.obj" \
"$(INTDIR)\mod_asis.obj" \
"$(INTDIR)\mod_auth.obj" \
"$(INTDIR)\mod_autoindex.obj" \
- "$(INTDIR)\mod_cgi.obj" \
"$(INTDIR)\mod_dir.obj" \
"$(INTDIR)\mod_env.obj" \
"$(INTDIR)\mod_imap.obj" \
- "$(INTDIR)\mod_include.obj" \
- "$(INTDIR)\mod_isapi.obj" \
"$(INTDIR)\mod_log_config.obj" \
"$(INTDIR)\mod_mime.obj" \
"$(INTDIR)\mod_negotiation.obj" \
"$(INTDIR)\mod_setenvif.obj" \
- "$(INTDIR)\mod_so.obj" \
"$(INTDIR)\mod_userdir.obj" \
"$(INTDIR)\modules.obj" \
- "$(INTDIR)\multithread.obj" \
"$(INTDIR)\readdir.obj" \
"$(INTDIR)\registry.obj" \
"$(INTDIR)\rfc1413.obj" \
- "$(INTDIR)\service.obj" \
"$(INTDIR)\util.obj" \
"$(INTDIR)\util_date.obj" \
"$(INTDIR)\util_md5.obj" \
"$(INTDIR)\util_script.obj" \
"$(INTDIR)\util_uri.obj" \
- "$(INTDIR)\util_win32.obj"
+ "$(INTDIR)\util_win32.obj" \
+ "$(INTDIR)\winnt.obj"
"$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -228,6 +192,8 @@
-@erase "$(INTDIR)\getopt.sbr"
-@erase "$(INTDIR)\http_config.obj"
-@erase "$(INTDIR)\http_config.sbr"
+ -@erase "$(INTDIR)\http_connection.obj"
+ -@erase "$(INTDIR)\http_connection.sbr"
-@erase "$(INTDIR)\http_core.obj"
-@erase "$(INTDIR)\http_core.sbr"
-@erase "$(INTDIR)\http_log.obj"
@@ -240,8 +206,10 @@
-@erase "$(INTDIR)\http_request.sbr"
-@erase "$(INTDIR)\http_vhost.obj"
-@erase "$(INTDIR)\http_vhost.sbr"
- -@erase "$(INTDIR)\md5c.obj"
- -@erase "$(INTDIR)\md5c.sbr"
+ -@erase "$(INTDIR)\iol_socket.obj"
+ -@erase "$(INTDIR)\iol_socket.sbr"
+ -@erase "$(INTDIR)\listen.obj"
+ -@erase "$(INTDIR)\listen.sbr"
-@erase "$(INTDIR)\mod_access.obj"
-@erase "$(INTDIR)\mod_access.sbr"
-@erase "$(INTDIR)\mod_actions.obj"
@@ -254,18 +222,12 @@
-@erase "$(INTDIR)\mod_auth.sbr"
-@erase "$(INTDIR)\mod_autoindex.obj"
-@erase "$(INTDIR)\mod_autoindex.sbr"
- -@erase "$(INTDIR)\mod_cgi.obj"
- -@erase "$(INTDIR)\mod_cgi.sbr"
-@erase "$(INTDIR)\mod_dir.obj"
-@erase "$(INTDIR)\mod_dir.sbr"
-@erase "$(INTDIR)\mod_env.obj"
-@erase "$(INTDIR)\mod_env.sbr"
-@erase "$(INTDIR)\mod_imap.obj"
-@erase "$(INTDIR)\mod_imap.sbr"
- -@erase "$(INTDIR)\mod_include.obj"
- -@erase "$(INTDIR)\mod_include.sbr"
- -@erase "$(INTDIR)\mod_isapi.obj"
- -@erase "$(INTDIR)\mod_isapi.sbr"
-@erase "$(INTDIR)\mod_log_config.obj"
-@erase "$(INTDIR)\mod_log_config.sbr"
-@erase "$(INTDIR)\mod_mime.obj"
@@ -274,22 +236,16 @@
-@erase "$(INTDIR)\mod_negotiation.sbr"
-@erase "$(INTDIR)\mod_setenvif.obj"
-@erase "$(INTDIR)\mod_setenvif.sbr"
- -@erase "$(INTDIR)\mod_so.obj"
- -@erase "$(INTDIR)\mod_so.sbr"
-@erase "$(INTDIR)\mod_userdir.obj"
-@erase "$(INTDIR)\mod_userdir.sbr"
-@erase "$(INTDIR)\modules.obj"
-@erase "$(INTDIR)\modules.sbr"
- -@erase "$(INTDIR)\multithread.obj"
- -@erase "$(INTDIR)\multithread.sbr"
-@erase "$(INTDIR)\readdir.obj"
-@erase "$(INTDIR)\readdir.sbr"
-@erase "$(INTDIR)\registry.obj"
-@erase "$(INTDIR)\registry.sbr"
-@erase "$(INTDIR)\rfc1413.obj"
-@erase "$(INTDIR)\rfc1413.sbr"
- -@erase "$(INTDIR)\service.obj"
- -@erase "$(INTDIR)\service.sbr"
-@erase "$(INTDIR)\util.obj"
-@erase "$(INTDIR)\util.sbr"
-@erase "$(INTDIR)\util_date.obj"
@@ -304,6 +260,8 @@
-@erase "$(INTDIR)\util_win32.sbr"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(INTDIR)\vc50.pdb"
+ -@erase "$(INTDIR)\winnt.obj"
+ -@erase "$(INTDIR)\winnt.sbr"
-@erase "$(OUTDIR)\ApacheCore.bsc"
-@erase "$(OUTDIR)\ApacheCore.dll"
-@erase "$(OUTDIR)\ApacheCore.exp"
@@ -314,46 +272,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /D "WIN32" /D "_DEBUG"\
- /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /D "_DEBUG" /D "WIN32"\
+ /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FR"$(INTDIR)\\"\
+ /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreD/
CPP_SBRS=.\CoreD/
-
-.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)\ApacheCore.bsc"
BSC32_SBRS= \
@@ -362,43 +286,40 @@
"$(INTDIR)\buildmark.sbr" \
"$(INTDIR)\getopt.sbr" \
"$(INTDIR)\http_config.sbr" \
+ "$(INTDIR)\http_connection.sbr" \
"$(INTDIR)\http_core.sbr" \
"$(INTDIR)\http_log.sbr" \
"$(INTDIR)\http_main.sbr" \
"$(INTDIR)\http_protocol.sbr" \
"$(INTDIR)\http_request.sbr" \
"$(INTDIR)\http_vhost.sbr" \
- "$(INTDIR)\md5c.sbr" \
+ "$(INTDIR)\iol_socket.sbr" \
+ "$(INTDIR)\listen.sbr" \
"$(INTDIR)\mod_access.sbr" \
"$(INTDIR)\mod_actions.sbr" \
"$(INTDIR)\mod_alias.sbr" \
"$(INTDIR)\mod_asis.sbr" \
"$(INTDIR)\mod_auth.sbr" \
"$(INTDIR)\mod_autoindex.sbr" \
- "$(INTDIR)\mod_cgi.sbr" \
"$(INTDIR)\mod_dir.sbr" \
"$(INTDIR)\mod_env.sbr" \
"$(INTDIR)\mod_imap.sbr" \
- "$(INTDIR)\mod_include.sbr" \
- "$(INTDIR)\mod_isapi.sbr" \
"$(INTDIR)\mod_log_config.sbr" \
"$(INTDIR)\mod_mime.sbr" \
"$(INTDIR)\mod_negotiation.sbr" \
"$(INTDIR)\mod_setenvif.sbr" \
- "$(INTDIR)\mod_so.sbr" \
"$(INTDIR)\mod_userdir.sbr" \
"$(INTDIR)\modules.sbr" \
- "$(INTDIR)\multithread.sbr" \
"$(INTDIR)\readdir.sbr" \
"$(INTDIR)\registry.sbr" \
"$(INTDIR)\rfc1413.sbr" \
- "$(INTDIR)\service.sbr" \
"$(INTDIR)\util.sbr" \
"$(INTDIR)\util_date.sbr" \
"$(INTDIR)\util_md5.sbr" \
"$(INTDIR)\util_script.sbr" \
"$(INTDIR)\util_uri.sbr" \
- "$(INTDIR)\util_win32.sbr"
+ "$(INTDIR)\util_win32.sbr" \
+ "$(INTDIR)\winnt.sbr"
"$(OUTDIR)\ApacheCore.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
$(BSC32) @<<
@@ -408,7 +329,7 @@
LINK32=link.exe
LINK32_FLAGS=os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib\
ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll\
+ advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll\
/incremental:yes /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386\
/def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
/implib:"$(OUTDIR)\ApacheCore.lib"
@@ -420,43 +341,40 @@
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\getopt.obj" \
"$(INTDIR)\http_config.obj" \
+ "$(INTDIR)\http_connection.obj" \
"$(INTDIR)\http_core.obj" \
"$(INTDIR)\http_log.obj" \
"$(INTDIR)\http_main.obj" \
"$(INTDIR)\http_protocol.obj" \
"$(INTDIR)\http_request.obj" \
"$(INTDIR)\http_vhost.obj" \
- "$(INTDIR)\md5c.obj" \
+ "$(INTDIR)\iol_socket.obj" \
+ "$(INTDIR)\listen.obj" \
"$(INTDIR)\mod_access.obj" \
"$(INTDIR)\mod_actions.obj" \
"$(INTDIR)\mod_alias.obj" \
"$(INTDIR)\mod_asis.obj" \
"$(INTDIR)\mod_auth.obj" \
"$(INTDIR)\mod_autoindex.obj" \
- "$(INTDIR)\mod_cgi.obj" \
"$(INTDIR)\mod_dir.obj" \
"$(INTDIR)\mod_env.obj" \
"$(INTDIR)\mod_imap.obj" \
- "$(INTDIR)\mod_include.obj" \
- "$(INTDIR)\mod_isapi.obj" \
"$(INTDIR)\mod_log_config.obj" \
"$(INTDIR)\mod_mime.obj" \
"$(INTDIR)\mod_negotiation.obj" \
"$(INTDIR)\mod_setenvif.obj" \
- "$(INTDIR)\mod_so.obj" \
"$(INTDIR)\mod_userdir.obj" \
"$(INTDIR)\modules.obj" \
- "$(INTDIR)\multithread.obj" \
"$(INTDIR)\readdir.obj" \
"$(INTDIR)\registry.obj" \
"$(INTDIR)\rfc1413.obj" \
- "$(INTDIR)\service.obj" \
"$(INTDIR)\util.obj" \
"$(INTDIR)\util_date.obj" \
"$(INTDIR)\util_md5.obj" \
"$(INTDIR)\util_script.obj" \
"$(INTDIR)\util_uri.obj" \
- "$(INTDIR)\util_win32.obj"
+ "$(INTDIR)\util_win32.obj" \
+ "$(INTDIR)\winnt.obj"
"$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -465,6 +383,36 @@
!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)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
"ApacheCore - Win32 Debug"
@@ -477,14 +425,24 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\ap_mpm.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
- ".\include\multithread.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_ALLOC=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
@@ -498,11 +456,14 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\ap_mpm.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\httpd.h"\
- ".\include\multithread.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -524,14 +485,25 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
+ ".\os\win32\iol_socket.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_BUFF_=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
@@ -545,12 +517,16 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
".\include\http_main.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
+ ".\os\win32\iol_socket.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -571,13 +547,23 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+NODEP_CPP_BUILD=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+
"$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)"
@@ -589,6 +575,9 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
@@ -630,19 +619,30 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\explain.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_request.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
@@ -656,13 +656,17 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\explain.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_request.h"\
".\include\http_vhost.h"\
".\include\httpd.h"\
@@ -678,7 +682,7 @@
!ENDIF
-SOURCE=.\main\http_core.c
+SOURCE=.\main\http_connection.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -687,12 +691,86 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\ap_mpm.h"\
+ ".\include\apr.h"\
+ ".\include\buff.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_config.h"\
+ ".\include\http_connection.h"\
+ ".\include\http_protocol.h"\
+ ".\include\http_request.h"\
+ ".\include\http_vhost.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_C=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+
+
+"$(INTDIR)\http_connection.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+DEP_CPP_HTTP_C=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\ap_config.h"\
+ ".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\ap_mpm.h"\
+ ".\include\apr.h"\
+ ".\include\buff.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_config.h"\
+ ".\include\http_connection.h"\
+ ".\include\http_protocol.h"\
+ ".\include\http_request.h"\
+ ".\include\http_vhost.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+
+
+"$(INTDIR)\http_connection.obj" "$(INTDIR)\http_connection.sbr" : $(SOURCE)\
+ $(DEP_CPP_HTTP_C) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+SOURCE=.\main\http_core.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+DEP_CPP_HTTP_CO=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\ap_config.h"\
+ ".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
".\include\ap_md5.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\fnmatch.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_config.h"\
+ ".\include\http_connection.h"\
".\include\http_core.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -701,30 +779,40 @@
".\include\http_vhost.h"\
".\include\httpd.h"\
".\include\rfc1413.h"\
- ".\include\scoreboard.h"\
".\include\util_md5.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_CO=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
-"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
+"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_HTTP_C=\
+DEP_CPP_HTTP_CO=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
".\include\ap_md5.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\fnmatch.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_config.h"\
+ ".\include\http_connection.h"\
".\include\http_core.h"\
".\include\http_log.h"\
".\include\http_main.h"\
@@ -733,7 +821,6 @@
".\include\http_vhost.h"\
".\include\httpd.h"\
".\include\rfc1413.h"\
- ".\include\scoreboard.h"\
".\include\util_md5.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
@@ -741,7 +828,7 @@
"$(INTDIR)\http_core.obj" "$(INTDIR)\http_core.sbr" : $(SOURCE)\
- $(DEP_CPP_HTTP_C) "$(INTDIR)"
+ $(DEP_CPP_HTTP_CO) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -756,6 +843,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -766,6 +857,13 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_L=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
@@ -779,6 +877,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -807,27 +909,27 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\ap_mpm.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
- ".\include\explain.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\http_request.h"\
- ".\include\http_vhost.h"\
".\include\httpd.h"\
- ".\include\multithread.h"\
- ".\include\scoreboard.h"\
- ".\include\util_script.h"\
".\include\util_uri.h"\
- ".\os\win32\getopt.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- ".\os\win32\registry.h"\
- ".\os\win32\service.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_M=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\main\xmlparse.h"\
"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
@@ -841,27 +943,19 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\ap_mpm.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
- ".\include\explain.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\http_request.h"\
- ".\include\http_vhost.h"\
".\include\httpd.h"\
- ".\include\multithread.h"\
- ".\include\scoreboard.h"\
- ".\include\util_script.h"\
".\include\util_uri.h"\
- ".\os\win32\getopt.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
- ".\os\win32\registry.h"\
- ".\os\win32\service.h"\
"$(INTDIR)\http_main.obj" "$(INTDIR)\http_main.sbr" : $(SOURCE)\
@@ -880,9 +974,12 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_config.h"\
".\include\http_core.h"\
".\include\http_log.h"\
@@ -895,6 +992,13 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_P=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
@@ -908,9 +1012,12 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_config.h"\
".\include\http_core.h"\
".\include\http_log.h"\
@@ -941,6 +1048,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\fnmatch.h"\
".\include\hsregex.h"\
@@ -951,11 +1062,18 @@
".\include\http_protocol.h"\
".\include\http_request.h"\
".\include\httpd.h"\
- ".\include\scoreboard.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+NODEP_CPP_HTTP_R=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+ ".\main\scoreboard.h"\
+
"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -968,6 +1086,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\fnmatch.h"\
".\include\hsregex.h"\
@@ -978,7 +1100,6 @@
".\include\http_protocol.h"\
".\include\http_request.h"\
".\include\httpd.h"\
- ".\include\scoreboard.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
@@ -1000,10 +1121,14 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.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_vhost.h"\
@@ -1011,6 +1136,13 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_V=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)"
@@ -1024,10 +1156,14 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.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_vhost.h"\
@@ -1043,45 +1179,110 @@
!ENDIF
-
-SOURCE=.\main\md5c.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-DEP_CPP_MD5C_=\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\ap_md5.h"\
- ".\include\hsregex.h"\
- ".\os\win32\os.h"\
-
-"$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-DEP_CPP_MD5C_=\
+SOURCE=.\os\win32\iol_socket.c
+DEP_CPP_IOL_S=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
- ".\include\ap_md5.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
+ ".\include\buff.h"\
".\include\hsregex.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\os\win32\iol_socket.h"\
".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_MD5C_=\
+NODEP_CPP_IOL_S=\
".\include\ap_config_auto.h"\
- ".\include\os.h"\
- ".\main\ebcdic.h"\
+ ".\include\ebcdic.h"\
-"$(INTDIR)\md5c.obj" "$(INTDIR)\md5c.sbr" : $(SOURCE) $(DEP_CPP_MD5C_)\
- "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+"$(INTDIR)\iol_socket.obj" : $(SOURCE) $(DEP_CPP_IOL_S) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+
+"$(INTDIR)\iol_socket.obj" "$(INTDIR)\iol_socket.sbr" : $(SOURCE)\
+ $(DEP_CPP_IOL_S) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+SOURCE=.\main\listen.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+DEP_CPP_LISTE=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\ap_config.h"\
+ ".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_listen.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
+ ".\include\buff.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_config.h"\
+ ".\include\http_log.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_LISTE=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+
+
+"$(INTDIR)\listen.obj" : $(SOURCE) $(DEP_CPP_LISTE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+DEP_CPP_LISTE=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\ap_config.h"\
+ ".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_listen.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
+ ".\include\buff.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_config.h"\
+ ".\include\http_log.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+
+
+"$(INTDIR)\listen.obj" "$(INTDIR)\listen.sbr" : $(SOURCE) $(DEP_CPP_LISTE)\
+ "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
!ENDIF
SOURCE=.\modules\standard\mod_access.c
@@ -1093,6 +1294,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -1103,6 +1308,13 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_A=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
@@ -1116,6 +1328,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -1144,6 +1360,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -1157,6 +1377,13 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AC=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
@@ -1170,6 +1397,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -1201,13 +1432,25 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
+ ".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AL=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
@@ -1221,9 +1464,14 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
+ ".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
@@ -1246,6 +1494,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -1258,6 +1510,13 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AS=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
@@ -1271,6 +1530,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -1301,16 +1564,28 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.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\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AU=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
@@ -1324,12 +1599,17 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.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\win32\os.h"\
@@ -1352,6 +1632,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\fnmatch.h"\
".\include\hsregex.h"\
@@ -1366,6 +1650,13 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AUT=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
@@ -1379,7 +1670,12 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
+ ".\include\fnmatch.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
".\include\http_core.h"\
@@ -1401,19 +1697,21 @@
!ENDIF
-SOURCE=.\modules\standard\mod_cgi.c
+SOURCE=.\modules\standard\mod_dir.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MOD_C=\
+DEP_CPP_MOD_D=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
- ".\include\fnmatch.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_config.h"\
".\include\http_core.h"\
".\include\http_log.h"\
@@ -1425,22 +1723,32 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+NODEP_CPP_MOD_D=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+
-"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
+"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_MOD_C=\
+DEP_CPP_MOD_D=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_config.h"\
".\include\http_core.h"\
".\include\http_log.h"\
@@ -1454,238 +1762,290 @@
".\os\win32\readdir.h"\
-"$(INTDIR)\mod_cgi.obj" "$(INTDIR)\mod_cgi.sbr" : $(SOURCE) $(DEP_CPP_MOD_C)\
+"$(INTDIR)\mod_dir.obj" "$(INTDIR)\mod_dir.sbr" : $(SOURCE) $(DEP_CPP_MOD_D)\
"$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\modules\standard\mod_dir.c
+SOURCE=.\modules\standard\mod_env.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MOD_D=\
+DEP_CPP_MOD_E=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.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\http_request.h"\
".\include\httpd.h"\
- ".\include\util_script.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_E=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
-"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
+"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_MOD_D=\
+DEP_CPP_MOD_E=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.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\http_request.h"\
".\include\httpd.h"\
- ".\include\util_script.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
-"$(INTDIR)\mod_dir.obj" "$(INTDIR)\mod_dir.sbr" : $(SOURCE) $(DEP_CPP_MOD_D)\
+"$(INTDIR)\mod_env.obj" "$(INTDIR)\mod_env.sbr" : $(SOURCE) $(DEP_CPP_MOD_E)\
"$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\modules\standard\mod_env.c
+SOURCE=.\modules\standard\mod_imap.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MOD_E=\
+DEP_CPP_MOD_I=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.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\http_request.h"\
".\include\httpd.h"\
+ ".\include\util_script.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_I=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
-"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
+"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_MOD_E=\
+DEP_CPP_MOD_I=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.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\http_request.h"\
".\include\httpd.h"\
+ ".\include\util_script.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
-"$(INTDIR)\mod_env.obj" "$(INTDIR)\mod_env.sbr" : $(SOURCE) $(DEP_CPP_MOD_E)\
+"$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE) $(DEP_CPP_MOD_I)\
"$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\modules\standard\mod_imap.c
+SOURCE=.\modules\standard\mod_log_config.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MOD_I=\
+DEP_CPP_MOD_L=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.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\http_request.h"\
".\include\httpd.h"\
- ".\include\util_script.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_L=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
-"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
+"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_MOD_I=\
+DEP_CPP_MOD_L=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.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\http_request.h"\
".\include\httpd.h"\
- ".\include\util_script.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
-"$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE) $(DEP_CPP_MOD_I)\
- "$(INTDIR)"
+"$(INTDIR)\mod_log_config.obj" "$(INTDIR)\mod_log_config.sbr" : $(SOURCE)\
+ $(DEP_CPP_MOD_L) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\modules\standard\mod_include.c
+SOURCE=.\modules\standard\mod_mime.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MOD_IN=\
+DEP_CPP_MOD_M=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.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\http_request.h"\
".\include\httpd.h"\
- ".\include\util_script.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_M=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
-"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
+"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_MOD_IN=\
+DEP_CPP_MOD_M=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.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\http_request.h"\
".\include\httpd.h"\
- ".\include\util_script.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
-"$(INTDIR)\mod_include.obj" "$(INTDIR)\mod_include.sbr" : $(SOURCE)\
- $(DEP_CPP_MOD_IN) "$(INTDIR)"
+"$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE) $(DEP_CPP_MOD_M)\
+ "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\os\win32\mod_isapi.c
+SOURCE=.\modules\standard\mod_negotiation.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MOD_IS=\
+DEP_CPP_MOD_N=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -1698,19 +2058,30 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+NODEP_CPP_MOD_N=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+
-"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
+"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_MOD_IS=\
+DEP_CPP_MOD_N=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -1725,319 +2096,167 @@
".\os\win32\readdir.h"\
-"$(INTDIR)\mod_isapi.obj" "$(INTDIR)\mod_isapi.sbr" : $(SOURCE)\
- $(DEP_CPP_MOD_IS) "$(INTDIR)"
+"$(INTDIR)\mod_negotiation.obj" "$(INTDIR)\mod_negotiation.sbr" : $(SOURCE)\
+ $(DEP_CPP_MOD_N) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\modules\standard\mod_log_config.c
+SOURCE=.\modules\standard\mod_setenvif.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MOD_L=\
+DEP_CPP_MOD_S=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.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"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_S=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
-"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
+"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_MOD_L=\
+DEP_CPP_MOD_S=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.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"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
-"$(INTDIR)\mod_log_config.obj" "$(INTDIR)\mod_log_config.sbr" : $(SOURCE)\
- $(DEP_CPP_MOD_L) "$(INTDIR)"
+"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\
+ $(DEP_CPP_MOD_S) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\modules\standard\mod_mime.c
+SOURCE=.\modules\standard\mod_userdir.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MOD_M=\
+DEP_CPP_MOD_U=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
- ".\include\http_log.h"\
+ ".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_U=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
-"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
+"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_MOD_M=\
+DEP_CPP_MOD_U=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
- ".\include\http_log.h"\
+ ".\include\http_request.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
-"$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE) $(DEP_CPP_MOD_M)\
- "$(INTDIR)"
+"$(INTDIR)\mod_userdir.obj" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\
+ $(DEP_CPP_MOD_U) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\modules\standard\mod_negotiation.c
+SOURCE=.\os\win32\modules.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MOD_N=\
+DEP_CPP_MODUL=\
".\include\alloc.h"\
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
- ".\include\http_core.h"\
- ".\include\http_log.h"\
- ".\include\http_request.h"\
".\include\httpd.h"\
- ".\include\util_script.h"\
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
-
-
-"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-DEP_CPP_MOD_N=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\buff.h"\
- ".\include\hsregex.h"\
- ".\include\http_config.h"\
- ".\include\http_core.h"\
- ".\include\http_log.h"\
- ".\include\http_request.h"\
- ".\include\httpd.h"\
- ".\include\util_script.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
-
-
-"$(INTDIR)\mod_negotiation.obj" "$(INTDIR)\mod_negotiation.sbr" : $(SOURCE)\
- $(DEP_CPP_MOD_N) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
-SOURCE=.\modules\standard\mod_setenvif.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-DEP_CPP_MOD_S=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.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\win32\os.h"\
- ".\os\win32\readdir.h"\
-
-
-"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-DEP_CPP_MOD_S=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.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\win32\os.h"\
- ".\os\win32\readdir.h"\
-
-
-"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\
- $(DEP_CPP_MOD_S) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
-SOURCE=.\modules\standard\mod_so.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-DEP_CPP_MOD_SO=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\buff.h"\
- ".\include\hsregex.h"\
- ".\include\http_config.h"\
- ".\include\http_log.h"\
- ".\include\httpd.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
-
-
-"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-DEP_CPP_MOD_SO=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\buff.h"\
- ".\include\hsregex.h"\
- ".\include\http_config.h"\
- ".\include\http_log.h"\
- ".\include\httpd.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
-
-
-"$(INTDIR)\mod_so.obj" "$(INTDIR)\mod_so.sbr" : $(SOURCE) $(DEP_CPP_MOD_SO)\
- "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
-SOURCE=.\modules\standard\mod_userdir.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-DEP_CPP_MOD_U=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\buff.h"\
- ".\include\hsregex.h"\
- ".\include\http_config.h"\
- ".\include\httpd.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
-
-
-"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-DEP_CPP_MOD_U=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\buff.h"\
- ".\include\hsregex.h"\
- ".\include\http_config.h"\
- ".\include\httpd.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
-
-"$(INTDIR)\mod_userdir.obj" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\
- $(DEP_CPP_MOD_U) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
-SOURCE=.\os\win32\modules.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-DEP_CPP_MODUL=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\buff.h"\
- ".\include\hsregex.h"\
- ".\include\http_config.h"\
- ".\include\httpd.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
+NODEP_CPP_MODUL=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
@@ -2051,6 +2270,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_config.h"\
@@ -2067,53 +2290,24 @@
!ENDIF
-SOURCE=.\os\win32\multithread.c
+SOURCE=.\os\win32\readdir.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
-DEP_CPP_MULTI=\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\hsregex.h"\
- ".\include\multithread.h"\
- ".\os\win32\os.h"\
-
-
-"$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-DEP_CPP_MULTI=\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\hsregex.h"\
- ".\include\multithread.h"\
- ".\os\win32\os.h"\
-
-
-"$(INTDIR)\multithread.obj" "$(INTDIR)\multithread.sbr" : $(SOURCE)\
- $(DEP_CPP_MULTI) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
-SOURCE=.\os\win32\readdir.c
DEP_CPP_READD=\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\types.h"\
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-
"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+DEP_CPP_READD=\
+ ".\os\win32\readdir.h"\
+
"$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE) $(DEP_CPP_READD)\
"$(INTDIR)"
@@ -2131,6 +2325,9 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
@@ -2138,6 +2335,12 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_REGIS=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)"
@@ -2151,6 +2354,9 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
@@ -2176,6 +2382,9 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
@@ -2185,7 +2394,14 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+NODEP_CPP_RFC14=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+
"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -2198,6 +2414,9 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
@@ -2216,61 +2435,6 @@
!ENDIF
-SOURCE=.\os\win32\service.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-DEP_CPP_SERVI=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\buff.h"\
- ".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
- ".\include\http_log.h"\
- ".\include\http_main.h"\
- ".\include\httpd.h"\
- ".\include\multithread.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
- ".\os\win32\registry.h"\
- ".\os\win32\service.h"\
-
-
-"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-DEP_CPP_SERVI=\
- ".\include\alloc.h"\
- ".\include\ap.h"\
- ".\include\ap_config.h"\
- ".\include\ap_ctype.h"\
- ".\include\buff.h"\
- ".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
- ".\include\http_log.h"\
- ".\include\http_main.h"\
- ".\include\httpd.h"\
- ".\include\multithread.h"\
- ".\include\util_uri.h"\
- ".\os\win32\os.h"\
- ".\os\win32\readdir.h"\
- ".\os\win32\registry.h"\
- ".\os\win32\service.h"\
-
-
-"$(INTDIR)\service.obj" "$(INTDIR)\service.sbr" : $(SOURCE) $(DEP_CPP_SERVI)\
- "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\main\util.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -2280,15 +2444,27 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_log.h"\
+ ".\include\http_main.h"\
+ ".\include\http_protocol.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
".\main\test_char.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
@@ -2302,10 +2478,15 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_log.h"\
+ ".\include\http_main.h"\
+ ".\include\http_protocol.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
".\main\test_char.h"\
@@ -2321,13 +2502,23 @@
!ENDIF
SOURCE=.\main\util_date.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
DEP_CPP_UTIL_D=\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_mmn.h"\
".\include\hsregex.h"\
".\include\util_date.h"\
".\os\win32\os.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+NODEP_CPP_UTIL_D=\
+ ".\include\ap_config_auto.h"\
+ ".\include\os.h"\
+
"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -2338,16 +2529,11 @@
DEP_CPP_UTIL_D=\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_mmn.h"\
".\include\hsregex.h"\
".\include\util_date.h"\
".\os\win32\os.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_UTIL_D=\
- ".\include\ap_config_auto.h"\
- ".\include\os.h"\
-
"$(INTDIR)\util_date.obj" "$(INTDIR)\util_date.sbr" : $(SOURCE)\
$(DEP_CPP_UTIL_D) "$(INTDIR)"
@@ -2365,7 +2551,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
".\include\ap_md5.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
@@ -2373,6 +2562,13 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_M=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
@@ -2386,7 +2582,10 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
".\include\ap_md5.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\httpd.h"\
@@ -2412,9 +2611,12 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_config.h"\
".\include\http_core.h"\
".\include\http_log.h"\
@@ -2427,6 +2629,13 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_S=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
@@ -2440,9 +2649,12 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_config.h"\
".\include\http_core.h"\
".\include\http_log.h"\
@@ -2473,15 +2685,24 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_log.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
".\main\uri_delims.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_U=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
"$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)"
@@ -2495,9 +2716,11 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
- ".\include\http_conf_globals.h"\
".\include\http_log.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
@@ -2522,6 +2745,9 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
@@ -2529,6 +2755,12 @@
".\include\util_uri.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_W=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
"$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)"
@@ -2542,6 +2774,9 @@
".\include\ap.h"\
".\include\ap_config.h"\
".\include\ap_ctype.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\apr.h"\
".\include\buff.h"\
".\include\hsregex.h"\
".\include\http_log.h"\
@@ -2553,6 +2788,84 @@
"$(INTDIR)\util_win32.obj" "$(INTDIR)\util_win32.sbr" : $(SOURCE)\
$(DEP_CPP_UTIL_W) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
+SOURCE=.\modules\mpm\winnt\winnt.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+DEP_CPP_WINNT=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\ap_config.h"\
+ ".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_listen.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\ap_mpm.h"\
+ ".\include\apr.h"\
+ ".\include\buff.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_config.h"\
+ ".\include\http_connection.h"\
+ ".\include\http_core.h"\
+ ".\include\http_log.h"\
+ ".\include\http_main.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\modules\mpm\winnt\mpm_default.h"\
+ ".\os\win32\getopt.h"\
+ ".\os\win32\iol_socket.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_WINNT=\
+ ".\include\ap_config_auto.h"\
+ ".\include\ebcdic.h"\
+ ".\include\os.h"\
+
+
+"$(INTDIR)\winnt.obj" : $(SOURCE) $(DEP_CPP_WINNT) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+DEP_CPP_WINNT=\
+ ".\include\alloc.h"\
+ ".\include\ap.h"\
+ ".\include\ap_config.h"\
+ ".\include\ap_ctype.h"\
+ ".\include\ap_hooks.h"\
+ ".\include\ap_iol.h"\
+ ".\include\ap_listen.h"\
+ ".\include\ap_mmn.h"\
+ ".\include\ap_mpm.h"\
+ ".\include\apr.h"\
+ ".\include\buff.h"\
+ ".\include\hsregex.h"\
+ ".\include\http_config.h"\
+ ".\include\http_connection.h"\
+ ".\include\http_core.h"\
+ ".\include\http_log.h"\
+ ".\include\http_main.h"\
+ ".\include\httpd.h"\
+ ".\include\util_uri.h"\
+ ".\modules\mpm\winnt\mpm_default.h"\
+ ".\os\win32\getopt.h"\
+ ".\os\win32\iol_socket.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+
+
+"$(INTDIR)\winnt.obj" "$(INTDIR)\winnt.sbr" : $(SOURCE) $(DEP_CPP_WINNT)\
+ "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
1.2 +1 -1 apache-2.0/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.nt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.nt 1999/08/24 05:34:14 1.1
+++ Makefile.nt 1999/08/27 22:56:42 1.2
@@ -68,7 +68,7 @@
nmake /nologo CFG="Apache - Win32 %LONG%" -f Apache.mak
cd os\win32
set CFG=ApacheModuleStatus - Win32 %LONG%
- nmake /nologo CFG="ApacheModuleStatus - Win32 %LONG%" -f ApacheModuleStatus.mak
+# nmake /nologo CFG="ApacheModuleStatus - Win32 %LONG%" -f ApacheModuleStatus.mak
# nmake /nologo CFG ""/nologo -f ApacheModuleStatus.mak"=ApacheModuleInfo - Win32 %LONG%" -f ApacheModuleInfo.mak
nmake /nologo CFG="ApacheModuleAuthAnon - Win32 %LONG%" -f ApacheModuleAuthAnon.mak
nmake /nologo CFG="ApacheModuleDigest - Win32 %LONG%" -f ApacheModuleDigest.mak
1.2 +8 -4 apache-2.0/src/ap/ap.dsp
Index: ap.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap.dsp 1999/08/24 05:50:30 1.1
+++ ap.dsp 1999/08/27 22:56:51 1.2
@@ -87,6 +87,10 @@
# End Source File
# Begin Source File
+SOURCE=.\ap_hooks.c
+# End Source File
+# Begin Source File
+
SOURCE=.\ap_signal.c
# End Source File
# Begin Source File
@@ -104,19 +108,19 @@
# End Group
# Begin Source File
-SOURCE=.\ap_md5c.c
+SOURCE=.\ap_base64.c
# End Source File
# Begin Source File
-SOURCE=.\ap_sha1.c
+SOURCE=.\ap_checkpass.c
# End Source File
# Begin Source File
-SOURCE=.\ap_checkpass.c
+SOURCE=.\ap_md5c.c
# End Source File
# Begin Source File
-SOURCE=.\ap_base64.c
+SOURCE=.\ap_sha1.c
# End Source File
# End Target
# End Project
1.2 +154 -123 apache-2.0/src/ap/ap.mak
Index: ap.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap.mak 1999/08/24 05:50:30 1.1
+++ ap.mak 1999/08/27 22:56:51 1.2
@@ -25,6 +25,8 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+
!IF "$(CFG)" == "ap - Win32 Release"
OUTDIR=.\Release
@@ -44,73 +46,43 @@
!ENDIF
CLEAN :
+ -@erase "$(INTDIR)\ap_base64.obj"
+ -@erase "$(INTDIR)\ap_checkpass.obj"
-@erase "$(INTDIR)\ap_cpystrn.obj"
-@erase "$(INTDIR)\ap_fnmatch.obj"
+ -@erase "$(INTDIR)\ap_hooks.obj"
-@erase "$(INTDIR)\ap_md5c.obj"
+ -@erase "$(INTDIR)\ap_sha1.obj"
-@erase "$(INTDIR)\ap_signal.obj"
-@erase "$(INTDIR)\ap_slack.obj"
-@erase "$(INTDIR)\ap_snprintf.obj"
- -@erase "$(INTDIR)\ap_sha1.obj"
- -@erase "$(INTDIR)\ap_base64.obj"
- -@erase "$(INTDIR)\ap_checkpass.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(OUTDIR)\ap.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D\
"_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX /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) $<
-<<
-
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
BSC32_SBRS= \
-
+
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
LIB32_OBJS= \
+ "$(INTDIR)\ap_base64.obj" \
+ "$(INTDIR)\ap_checkpass.obj" \
"$(INTDIR)\ap_cpystrn.obj" \
"$(INTDIR)\ap_fnmatch.obj" \
+ "$(INTDIR)\ap_hooks.obj" \
"$(INTDIR)\ap_md5c.obj" \
+ "$(INTDIR)\ap_sha1.obj" \
"$(INTDIR)\ap_signal.obj" \
"$(INTDIR)\ap_slack.obj" \
- "$(INTDIR)\ap_snprintf.obj" \
- "$(INTDIR)\ap_sha1.obj" \
- "$(INTDIR)\ap_base64.obj" \
- "$(INTDIR)\ap_checkpass.obj"
+ "$(INTDIR)\ap_snprintf.obj"
"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -136,26 +108,50 @@
!ENDIF
CLEAN :
+ -@erase "$(INTDIR)\ap_base64.obj"
+ -@erase "$(INTDIR)\ap_checkpass.obj"
-@erase "$(INTDIR)\ap_cpystrn.obj"
-@erase "$(INTDIR)\ap_fnmatch.obj"
+ -@erase "$(INTDIR)\ap_hooks.obj"
-@erase "$(INTDIR)\ap_md5c.obj"
+ -@erase "$(INTDIR)\ap_sha1.obj"
-@erase "$(INTDIR)\ap_signal.obj"
-@erase "$(INTDIR)\ap_slack.obj"
-@erase "$(INTDIR)\ap_snprintf.obj"
- -@erase "$(INTDIR)\ap_sha1.obj"
- -@erase "$(INTDIR)\ap_base64.obj"
- -@erase "$(INTDIR)\ap_checkpass.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(OUTDIR)\ap.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D\
"_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\ap_base64.obj" \
+ "$(INTDIR)\ap_checkpass.obj" \
+ "$(INTDIR)\ap_cpystrn.obj" \
+ "$(INTDIR)\ap_fnmatch.obj" \
+ "$(INTDIR)\ap_hooks.obj" \
+ "$(INTDIR)\ap_md5c.obj" \
+ "$(INTDIR)\ap_sha1.obj" \
+ "$(INTDIR)\ap_signal.obj" \
+ "$(INTDIR)\ap_slack.obj" \
+ "$(INTDIR)\ap_snprintf.obj"
+
+"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
@@ -187,30 +183,6 @@
$(CPP_PROJ) $<
<<
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
-BSC32_SBRS= \
-
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
-LIB32_OBJS= \
- "$(INTDIR)\ap_cpystrn.obj" \
- "$(INTDIR)\ap_fnmatch.obj" \
- "$(INTDIR)\ap_md5c.obj" \
- "$(INTDIR)\ap_signal.obj" \
- "$(INTDIR)\ap_slack.obj" \
- "$(INTDIR)\ap_snprintf.obj" \
- "$(INTDIR)\ap_sha1.obj" \
- "$(INTDIR)\ap_base64.obj" \
- "$(INTDIR)\ap_checkpass.obj"
-
-"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
- $(LIB32) @<<
- $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug"
SOURCE=.\ap_cpystrn.c
@@ -222,7 +194,9 @@
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
@@ -231,13 +205,12 @@
"..\os\win32\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-
+
NODEP_CPP_AP_CP=\
"..\include\ap_config_auto.h"\
"..\include\ebcdic.h"\
"..\include\os.h"\
- "..\include\sfio.h"\
-
+
"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
@@ -249,14 +222,16 @@
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
"..\include\util_uri.h"\
"..\os\win32\os.h"\
"..\os\win32\readdir.h"\
-
+
"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
@@ -276,11 +251,11 @@
"..\os\win32\os.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-
+
NODEP_CPP_AP_FN=\
"..\include\ap_config_auto.h"\
"..\include\os.h"\
-
+
"$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) $(DEP_CPP_AP_FN) "$(INTDIR)"
@@ -294,13 +269,41 @@
"..\include\fnmatch.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
-
+
"$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) $(DEP_CPP_AP_FN) "$(INTDIR)"
!ENDIF
+SOURCE=.\ap_hooks.c
+DEP_CPP_AP_HO=\
+ "..\include\alloc.h"\
+ "..\include\ap.h"\
+ "..\include\ap_config.h"\
+ "..\include\ap_ctype.h"\
+ "..\include\ap_hooks.h"\
+ "..\include\ap_iol.h"\
+ "..\include\ap_mmn.h"\
+ "..\include\apr.h"\
+ "..\include\buff.h"\
+ "..\include\hsregex.h"\
+ "..\include\httpd.h"\
+ "..\include\util_uri.h"\
+ "..\os\win32\os.h"\
+ "..\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_AP_HO=\
+ "..\include\ap_config_auto.h"\
+ "..\include\ebcdic.h"\
+ "..\include\os.h"\
+
+
+"$(INTDIR)\ap_hooks.obj" : $(SOURCE) $(DEP_CPP_AP_HO) "$(INTDIR)"
+
+
SOURCE=.\ap_signal.c
!IF "$(CFG)" == "ap - Win32 Release"
@@ -310,7 +313,9 @@
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
@@ -319,13 +324,12 @@
"..\os\win32\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-
+
NODEP_CPP_AP_SI=\
"..\include\ap_config_auto.h"\
"..\include\ebcdic.h"\
"..\include\os.h"\
- "..\include\sfio.h"\
-
+
"$(INTDIR)\ap_signal.obj" : $(SOURCE) $(DEP_CPP_AP_SI) "$(INTDIR)"
@@ -337,14 +341,16 @@
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
"..\include\util_uri.h"\
"..\os\win32\os.h"\
"..\os\win32\readdir.h"\
-
+
"$(INTDIR)\ap_signal.obj" : $(SOURCE) $(DEP_CPP_AP_SI) "$(INTDIR)"
@@ -360,7 +366,9 @@
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\http_log.h"\
@@ -370,13 +378,12 @@
"..\os\win32\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-
+
NODEP_CPP_AP_SL=\
"..\include\ap_config_auto.h"\
"..\include\ebcdic.h"\
"..\include\os.h"\
- "..\include\sfio.h"\
-
+
"$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)"
@@ -388,7 +395,9 @@
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\http_log.h"\
@@ -396,7 +405,7 @@
"..\include\util_uri.h"\
"..\os\win32\os.h"\
"..\os\win32\readdir.h"\
-
+
"$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)"
@@ -412,7 +421,9 @@
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
@@ -421,13 +432,12 @@
"..\os\win32\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.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)"
@@ -439,78 +449,84 @@
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
"..\include\util_uri.h"\
"..\os\win32\os.h"\
"..\os\win32\readdir.h"\
+
-
"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
!ENDIF
-SOURCE=.\ap_md5c.c
+SOURCE=.\ap_base64.c
!IF "$(CFG)" == "ap - Win32 Release"
-DEP_CPP_AP_MD=\
+DEP_CPP_AP_BA=\
+ "..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
- "..\include\ap_md5.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_AP_MD=\
+
+NODEP_CPP_AP_BA=\
"..\include\ap_config_auto.h"\
"..\include\os.h"\
".\ebcdic.h"\
-
+
-"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
+"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ap - Win32 Debug"
-DEP_CPP_AP_MD=\
+DEP_CPP_AP_BA=\
+ "..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
- "..\include\ap_md5.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
+
-
-"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
+"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
!ENDIF
-
SOURCE=.\ap_checkpass.c
!IF "$(CFG)" == "ap - Win32 Release"
DEP_CPP_AP_CH=\
+ "..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_md5.h"\
"..\include\ap_mmn.h"\
+ "..\include\ap_sha1.h"\
+ "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-
+
NODEP_CPP_AP_CH=\
"..\include\ap_config_auto.h"\
"..\include\os.h"\
- ".\ebcdic.h"\
-
+
"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
@@ -518,93 +534,108 @@
!ELSEIF "$(CFG)" == "ap - Win32 Debug"
DEP_CPP_AP_CH=\
+ "..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_md5.h"\
"..\include\ap_mmn.h"\
+ "..\include\ap_sha1.h"\
+ "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
+
-
"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
!ENDIF
-SOURCE=.\ap_sha1.c
+SOURCE=.\ap_md5c.c
!IF "$(CFG)" == "ap - Win32 Release"
-DEP_CPP_AP_SH=\
+DEP_CPP_AP_MD=\
+ "..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
- "..\include\ap_sha1.h"\
+ "..\include\ap_md5.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_AP_SH=\
+
+NODEP_CPP_AP_MD=\
"..\include\ap_config_auto.h"\
"..\include\os.h"\
".\ebcdic.h"\
-
+
-"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
+"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ap - Win32 Debug"
-DEP_CPP_AP_SH=\
+DEP_CPP_AP_MD=\
+ "..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
- "..\include\ap_sha1.h"\
+ "..\include\ap_md5.h"\
"..\include\ap_mmn.h"\
+ "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
-
+
-"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
+"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
!ENDIF
-SOURCE=.\ap_base64.c
+SOURCE=.\ap_sha1.c
!IF "$(CFG)" == "ap - Win32 Release"
-DEP_CPP_AP_BA=\
+DEP_CPP_AP_SH=\
+ "..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
"..\include\ap_mmn.h"\
+ "..\include\ap_sha1.h"\
+ "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_AP_BA=\
+
+NODEP_CPP_AP_SH=\
"..\include\ap_config_auto.h"\
"..\include\os.h"\
".\ebcdic.h"\
-
+
-"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
+"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ap - Win32 Debug"
-DEP_CPP_AP_BA=\
+DEP_CPP_AP_SH=\
+ "..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
"..\include\ap_mmn.h"\
+ "..\include\ap_sha1.h"\
+ "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
-
+
-"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
+"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
!ENDIF
+
!ENDIF
1.5 +1 -0 apache-2.0/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ap_config.h 1999/08/26 16:54:14 1.4
+++ ap_config.h 1999/08/27 22:56:59 1.5
@@ -1075,6 +1075,7 @@
#else /* WIN32 */
#include <winsock2.h>
+#include <mswsock.h> /* AcceptEx, et. al. TODO: move into OS specific file (os.h? apr?) */
#include <malloc.h>
#include <io.h>
#include <fcntl.h>
1.6 +2 -0 apache-2.0/src/main/alloc.c
Index: alloc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/alloc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alloc.c 1999/08/27 22:03:05 1.5
+++ alloc.c 1999/08/27 22:57:05 1.6
@@ -201,6 +201,8 @@
static union block_hdr *block_freelist = NULL;
static ap_thread_mutex *alloc_mutex;
+static ap_thread_mutex *spawn_mutex; /* Added back in for WIN32... */
+
#ifdef POOL_DEBUG
static char *known_stack_point;
static int stack_direction;
1.3 +5 -1 apache-2.0/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- http_main.c 1999/08/26 10:45:56 1.2
+++ http_main.c 1999/08/27 22:57:07 1.3
@@ -233,8 +233,12 @@
}
pool *g_pHookPool;
-
+#ifdef WIN32
+__declspec(dllexport)
+ int apache_main(int argc, char *argv[])
+#else
int main(int argc, char **argv)
+#endif
{
int c;
int configtestonly = 0;
1.11 +1 -1 apache-2.0/src/modules/mpm/winnt/winnt.c
Index: winnt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- winnt.c 1999/08/21 04:43:15 1.10
+++ winnt.c 1999/08/27 22:57:18 1.11
@@ -66,11 +66,11 @@
#include "ap_mpm.h"
#include "ap_config.h"
#include "ap_listen.h"
-#include "multithread.h"
#include "../os/win32/getopt.h"
#include "mpm_default.h"
#include "../os/win32/iol_socket.h"
#include "winnt.h"
+
/*
* Definitions of WINNT MPM specific config globals
1.2 +13 -12 apache-2.0/src/os/win32/modules.c
Index: modules.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/modules.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- modules.c 1999/08/24 06:45:40 1.1
+++ modules.c 1999/08/27 22:57:24 1.2
@@ -7,15 +7,16 @@
#include "http_config.h"
extern module core_module;
-extern module so_module;
+extern module mpm_winnt_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 includes_module;
extern module autoindex_module;
extern module dir_module;
-extern module cgi_module;
+//extern module cgi_module;
extern module userdir_module;
extern module alias_module;
extern module env_module;
@@ -24,19 +25,19 @@
extern module imap_module;
extern module action_module;
extern module setenvif_module;
-extern module isapi_module;
+//extern module isapi_module;
module *ap_prelinked_modules[] = {
&core_module,
- &so_module,
+// &so_module,
&mime_module,
&access_module,
&auth_module,
&negotiation_module,
- &includes_module,
+// &includes_module,
&autoindex_module,
&dir_module,
- &cgi_module,
+// &cgi_module,
&userdir_module,
&alias_module,
&env_module,
@@ -45,20 +46,20 @@
&imap_module,
&action_module,
&setenvif_module,
- &isapi_module,
+// &isapi_module,
NULL
};
module *ap_preloaded_modules[] = {
&core_module,
- &so_module,
+// &so_module,
&mime_module,
&access_module,
&auth_module,
&negotiation_module,
- &includes_module,
+// &includes_module,
&autoindex_module,
&dir_module,
- &cgi_module,
+// &cgi_module,
&userdir_module,
&alias_module,
&env_module,
@@ -67,6 +68,6 @@
&imap_module,
&action_module,
&setenvif_module,
- &isapi_module,
+// &isapi_module,
NULL
};
1.2 +169 -0 apache-2.0/src/os/win32/os.c
Index: os.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/os.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os.c 1999/08/24 06:45:40 1.1
+++ os.c 1999/08/27 22:57:27 1.2
@@ -4,4 +4,173 @@
*/
#include "os.h"
+/* following includes added for thread stuff from multithread.c
+ * Kill it when APR is in
+ */
+//#include "ap_config.h"
+//#include <process.h>
+#include <assert.h>
+#include <winsock2.h>
+/*
+ * Some code pulled from multithread.c. Keep it here until APR comes online...
+ */
+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);
+}
1.3 +35 -0 apache-2.0/src/os/win32/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- os.h 1999/08/26 18:11:33 1.2
+++ os.h 1999/08/27 22:57:27 1.3
@@ -123,4 +123,39 @@
/* Other ap_os_ routines not used by this platform */
#define ap_os_kill(pid, sig) kill(pid, sig)
+/* Moved from multithread.h. Axe this stuff when APR comes online... */
+
+#define MULTI_OK (0)
+#define MULTI_TIMEOUT (1)
+#define MULTI_ERR (2)
+
+typedef void mutex;
+typedef void semaphore;
+typedef void thread;
+typedef void event;
+
+thread *create_thread(void (thread_fn) (void *thread_arg), void *thread_arg);
+int kill_thread(thread *thread_id);
+int await_thread(thread *thread_id, int sec_to_wait);
+void exit_thread(int status);
+void free_thread(thread *thread_id);
+
+API_EXPORT(mutex *) ap_create_mutex(char *name);
+API_EXPORT(mutex *) ap_open_mutex(char *name);
+API_EXPORT(int) ap_acquire_mutex(mutex *mutex_id);
+API_EXPORT(int) ap_release_mutex(mutex *mutex_id);
+API_EXPORT(void) ap_destroy_mutex(mutex *mutex_id);
+
+semaphore *create_semaphore(int initial);
+int acquire_semaphore(semaphore *semaphore_id);
+int release_semaphore(semaphore *semaphore_id);
+void destroy_semaphore(semaphore *semaphore_id);
+
+event *create_event(int manual, int initial, char *name);
+event *open_event(char *name);
+int acquire_event(event *event_id);
+int set_event(event *event_id);
+int reset_event(event *event_id);
+void destroy_event(event *event_id);
+
#endif /* ! APACHE_OS_H */
Re: cvs commit: apache-2.0/src/os/win32 modules.c os.c os.h
Posted by Dean Gaudet <dg...@arctic.org>.
On 27 Aug 1999 stoddard@hyperreal.org wrote:
> And Dean's gonna but me for sure for the http_main hit. It's may be
> possible to name a DLL entry point 'main()'. Just havent tried it yet.
why not make apache_main() the default, and stick something which calls it
in os.c?
Dean
Re: cvs commit: apache-2.0/src/os/win32 modules.c os.c os.h
Posted by Alexei Kosut <ak...@leland.Stanford.EDU>.
On 27 Aug 1999 stoddard@hyperreal.org wrote:
> And Dean's gonna but me for sure for the http_main hit. It's may be
> possible to name a DLL entry point 'main()'. Just havent tried it yet.
Yes, it is. When we first DLL-ized the Win32 port of Apache (around
1.3a1?) it was done that way - ApacheCore.dll had main(), and Apache.exe
did nothing but link the DLL. Thing is, VC++ won't compile a binary with
no object files, so we had to put a dummy() function just to make it
happy.
That concept just made me queasy, and we (Ben and I, mostly) decided that
it was better all around to rename main() to apache_main() and have
Apache.exe contain a real main() that calls apache_main(). This gave VC++
a real function, moved main() out of the DLL (which, in theory, let
ApacheCore.dll be included by other apps, although I don't think anyone
ever did that), and in general made everything more asthetically pleasing.
The comment in os/win32/main_win32.c explains this, by the way.
--
Alexei Kosut <ak...@cs.stanford.edu> <http://www.stanford.edu/~akosut/>
Stanford University, Class of 2001 * Apache <http://www.apache.org/> *