Windows manifests are ;1 for .exe, ;2 for .dll and .so - ref: http://msdn.microsoft.com/en-us/library/ms235591.aspx

Embed the .manifest files of all httpd binaries as a post-build operation. This ensures the exported (Studio 97 generated) .mak files create a usable Apache directly from the VC 8 (Studio 2005) command line environment.

Revert Revision 397647 While it solves the studio 2005 (we desire this), it breaks the studio 6 packaging (we require this). Discussion on list of practical solutions.

This resource /D syntax was pretty horridly imported into VS 2005, change the quotation to ensure a peaceful transition to sln/vcproj files.

Remove all /machine:I386 references, these are getting in the way of switching linkers from the x86 (default linker) to x64 or other possible target platforms. (Also, this commit cleans up lingering /GX switches from the 'BASE' options that are supposed to be unused).

s|/GX |/EHsc | because they were always synonyms, and Visual Studio 2005 edition complains bitterly and loudly that /GX is deprecated.

Remove a host of dependencies upon awk, using the same template for nearly every .rc compilation (giving the output .res file a different name for each component). Adds AP_SERVER_BASEPROJECT to ap_revision.h so we can display the proper name of "Apache HTTP Server" as opposed to AP_SERVER_BASEPRODUCT (which is, and should remain, simply "Apache" for the server string tokens.)

Reintroduce stack frame construction with /Oy- (removal was implied by /O2). This makes binaries far easier to debug, during operation and for post-crash .dmp analysis. Do not alter /Gs optimizations per brane. Reviewed by: stoddard, brane

Catch up with Apache.exe->httpd.exe rename; it seems svn rn can't be combined with svn commit and source changes.

Apache.exe -> httpd.exe - per discussion on dev@httpd to make Win32 consistent with Unix, and as importantly, quitclaim the 'Apache HTTP Server' project's claim on something not in the spirit of the greater Foundation.

This change eliminates the intermediate httpd.lib from the build of libhttpd.dll - it was required for the support applications to avoid linking to the libhttpd.dll, but those functions have all moved to apr and apr-util. This change also prepares us to eliminate libhttpd.def once all of the appropriate AP_DECLARE tags are assigned.

Correction, commited the vc5. Need vc6 in the tree. Humble appologies.

The Win32 overhaul, in summary; Modules are named mod_foo.so Dynamic Libraries are named libfoo.dll, and are stored in bin/ The former ApacheCoreDll is now libhttpd.dll Apache.exe moves to bin/ The make install now copies include, lib, and libexec All build options are normalized, filenames adjusted appropriately

And this gets Apache for Windows compiling from the command line and serving files again. The APR_DECLARE_DATA declaration allows the ap_*_type structures to be exported which is reqired for the correct operation of the AP_BUCKET_IS_* macros. An alternate way to fix this problem is to explicitly break the bucket type out of the "type" structure in ap_bucketi and represent each bucket type with an enum.

We build through Apache.exe!!! Onwards...

Windows project file update to accomodate the new directory structure.

This patch illustrates the new locations, and makes the majority of the adjustments. Now to actually try to build the thing.

Get WIN32 building again

Make Win32 build again

Improve legability for new Win32 hackers (I hope)

That's the end of things broken this morning... now to try Jeff's patch

Fix compile break in Win32

Nice to see we build again on Win32

Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper) and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE. All _VAR_ flavors changes to _DATA to be absolutely clear. Thank you Greg, for the most obvious suggestion.

Regardless of reaction to a symbol rename -within- the sources, these external symbols change for clarity.

First cut at a file bucket. Modify the core_filter to handle use of apr_sendfile(). Modify ap_send_fd() to use the new file bucket.

Add ap_buckets_pipe.c and remove iol_socket and iol_file

Add a couple of new bucket functions to the Win32 project file.

Win32: Add bucket brigades and util_filter to the project file.

Add a useful header PR: Obtained from: Submitted by: Reviewed by:

Win32: Add util_xml.c to ApacheCore.

Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation... see src/lib/apr/apr_compat.h for most details. Also a few minor nits to get Win32 to build. PR: Obtained from: Submitted by: Reviewed by:

fix the Win32 build w.r.t recent iol_socket changes Submitted by: Keith Wannamaker

Add mpm.h to the src/modules/mpm/winnt directory (it's empty for now, but its presense is required for http_core.c, et. al.). Update ApacheCore.dsp to pick it up in the include path.

PR: Obtained from: Submitted by: Reviewed by: Fix a silly oversight.

PR: Obtained from: Submitted by: Reviewed by: Fixes 1) The htpasswd and ab binaries, by converting ApacheCore.dsp to a library MSVC project. 2) Creates the ApacheCoreDll.dsp project to produce the dso version ApacheCore.dll 3) Some misc fixups to the original http_main.c -> Apache.exe conversion that misses newly added symbols. Code fixes to follow in a seperate patch.

PR: Obtained from: Submitted by: Reviewed by: Unbind the old main_win32.c code and rebind to the new mpm logic in the modules/mpm/winnt directory. Includes some simple cleanups. The old sources in os/win32 will disappear at the end of this week.

PR: Obtained from: Submitted by: Reviewed by: Kill the Win32 library project ap.dsp and slide http_main.c from the ApacheCore.dsp into Apache.dsp - this is in prepartion of the real services update, which will move registry.c and service.c back into ApacheCore.dsp, kill both headers and incorporate their symbols into the mpm/winnt/winnt.h file. main_win32.c will die as well, with it's few remaining functions moving into the mpm.

This patch corrects the issues from the AP_EXPORT and linkage specification arguments to the ap_hooks.h declarations. As with the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR, and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR. I will be happy to revert the inclusion of ap_config.h from httpd.h if this bothers anyone. More individual modules need to be patched if we do so. The API_EXPORTs all moved into central storage in the ap_config.h header. Without WIN32 or API_STATIC compile time declarations, these macros remain no-ops. This patch also moves the following data from http_main to http_config: const char *ap_server_argv0; const char *ap_server_root; ap_array_header_t *ap_server_pre_read_config; ap_array_header_t *ap_server_post_read_config; ap_array_header_t *ap_server_config_defines; And the following variables had already moved into ap_hooks.c: ap_pool_t *g_pHookPool; (initialized now in http_config) int g_bDebugHooks; (out of http_config) const char *g_szCurrentHookName; (out of http_config) The changes to http_main.c are in preparation for that module to move out to a seperate .exe for win32. Other platforms will be unaffected, outside of these changes.

Win32: Convert ap_proc_t to tranparent type.

Current and clean make files for Win95. Changes Include: All projects link incrementally with no link maps in Debug mode. New cvstodsp6.pl and dsp6tocvs.pl will fix up /the /ZI - /Zi issue. Includes corrections noted by Tim Costello

This commit will most likely break everybody on Windows. The .dsp files I am checking in though will build a usable Apache on Windows. This finishes at least the first round of the merge work to get the common code into common files in APR.

Radical overhaul of the Apache-2.0/Win32 mpm <-> service schema. 1) Services and Registry are not part of the core Apache operations, so registry.c and service.c are moved into Apache.exe - assuring the service control layers of NT and 95 are truly isolated. 2) Isolation can't be complete, we need to know when the mpm is fully initialized. A new pointer to a no-arg function returning void is provided for this purpose, ap_mpm_init_complete. It is only called if overridden with a non-NULL value prior to invoking apache_main. 3) Control+C, Control+Break are handled on both WinNT and Win9x. 4) The window close, logoff and shutdown events are handled on WinNT. 5) The beginnings of a Win95 service startup are provided, -k startservice but this is horribly incomplete since Win95 will NOT report shutdown.

Cleanup of Apache build with pcre in Win32. Plus clean up ab and htdigest to conform to build of other support executables. Everything seems to be working again.

First crack at getting Apache to build with pcre in Win32. Cleans up all the gen_ projects to strip off garbage files, as well, and follows the same pattern for dftables.

Final .dsp changes to produce the lightest weight builds without precompiled headers or source browse files under Win32. Enabling these is straightforward, if that's what the user desires. Also correct minor errors, and reset some project defaults to their current config.

PR: Obtained from: Submitted by: William Rowe Reviewed by: With this change, I believe that ap.h can now be safely swept out to the attic, but I will leave for at least one other to confirm.

Revamp the Win32 make environment. Makefiles have been removed and Apache.dsw created to bring together all the pieces. Create new file os/win32/BaseAddr.ref to define module base addresses (to prevent dll relocation at start-up). Submitted by: William Rowe Reviewed by: Bill Stoddard

linkwin20.diffs Resolves: 1) Explicit /base: addresses by the following table... Required sizes are for debug builds. It is assumed that as we increase the size of aprlib, we will be trimming the size of ApacheCore, and the 278A0000 base can move down. ApacheCore.dll 27800000 80000 required aprlib.dll 278A0000 40000 required ApacheModuleAuthAnon.dsp 27900000 ApacheModuleCERNMeta.dsp 27910000 ApacheModuleDigest.dsp 27920000 ApacheModuleExpires.dsp 27930000 ApacheModuleHeaders.dsp 27940000 ApacheModuleInfo.dll 27950000 ApacheModuleRewrite.dsp 27960000 20000 required ApacheModuleSpeling.dsp 27980000 ApacheModuleStatus.dsp 27990000 ApacheModuleUserTrack.dsp 279A0000 ApacheModuleProxy.dsp 279B0000 20000 anticipated 3 slots still available 279C0000 2) Make APR consistent with the rest of the API and not build septypes for debugging (in other words, roll in the debug symbols as every other module does.) If we decide we LIKE /pdbtype:septypes... then we should be using them throughout. 3) Slide the current path specs into /libpath: options so the library list is more ledgible. 4) Drop all the gui crud from the library list. Everything listed is referenced, with the following exceptions: *) don't do anything with msvcrtd/oldnames today. *) aprlib and ApacheCore have the same list, since functions may still be moving between them. *) apache.exe looses networking (it doesn't), while it keeps advapi, which I don't think it needs, but it could later. *) add aprlib to ApacheModuleProxy, since it will need it. *) hang mswsock whereever ws2_32 is invoked. I believe the most special case was ApacheModuleProxy, which may become entirely APR. But for today we hang onto both. 5) MAP, MAP, MAP, everything gets a map. I for one have an untold number of installed OS's and boot mappings, and the debugger isn't installed to all of them. We gotta be able to track down those renegade GP faults. (What faults... I know, it's clean, but I am overly cautious that way.) 6) Set the DEFAULT linkage to be this linkage. Because "it's a vc thing" the defaults were not all that useful as a starting point (take, for example, the joke of linking to the OLE libraries). Submitted by: William Rowe

Win32: First cut at getting mod_isapi working under 2.0 Submitted by: William Rowe

Add util_cfgtreee.c to the win32 build

Eliminate os.c and ApacheOS.dsp, ApacheOS.mak, et. al. Update the winnt MPM to use native thread control calls rather than the deprecated stuff in os.c. Even though I don't use APR in the MPM yet, this is forward progress.

Turn off precompiled header support for Apache.mak/dsp and ApacheCore.mak/dsp. Submitted by: William Rowe Reviewed by: Bill Stoddard

Windows: Can now install/uninstall Apache as a service and start/stop apache via net start and net stop commands. Not extensively tested, so there may be bugs in this still.

Include mod_include and mod_so in the Windows build. Submitted by: Allan Edwards Reviewed by: Ryan Bloom

Remove the readdir files from os/win32. These are taken care of by APR now, and they have been bothering me. This is my first attempt at generating a Makefile for Windows, but it seems to have worked for me.

Win32: First cut at getting apache -k restart|shutdown and running apache as a service working

Get rid of dependency on os/win32/getopt.c & .h

Grrrr, commit apachecore.dsp rather than apachecore.def... This adds mod_cgi back into the Win32 build

Temporary hacks to the Win32 project files to get the server working

Add apr include file search path. Remove alloc.c and alloc.h

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!

Apache 1.3.9 baseline for the Apache 2.0 repository. Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9 Submitted by: Apache Group