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

fix windows build: add path to mod_ssl.h

After discussions at length on dev@apr/httpd, it is determined that the older .dbg format symbols are not worth the interference with generating complete .pdb symbolic debugging databases. This patch further eliminates pdbtype:sept flags that interfere with deciphering local symbols and type information.

After consultations on the APR list, it was decided that /map files are fairly redundant when you retain rich .pdb debugging symbol files. We have rarely used them, and generally .dbg and .pdb files prove much more useful for the cases we have. While eliminating /map files, we are also shrinking the size of the .dbg files by stripping 'private' symbol information. Really this means less rich diagnostics from Dr. Watson on NT or Win9x when they query the .dbg symbols in creating a DrWatson log file. But it's more than compensated for on newer OS'es where Dr. Watson will query the .pdb symbols, on all Win32 flavors when WinDbg is used with the .pdb symbols, and the fact that the distribution of binary symbols will use less bandwidth when less information is duplicated from the .pdb format into the .dbg files.

foo.dbgmark turned out to be the same 8.3 name as foo.dbg itself, which was badness. Twist this puppy to .dbr, the only name I could invent that doesn't look like any database file extension I recall. It stands for .dbg rebased.

*) Introduce debugging symbols for Win32 release builds, both .pdb and .dbg files (older debuggers and Dr. Watson-type utilities on WinNT or Win9x don't support the newer .pdb flavor.) [Allen Edwards, William Rowe]

Catch up with the changes to apr/build/win32ver.awk and name all loadable httpd modules as .so, internally. Credit to Mladen Turk for identifing the issue.

*) Split all Win32 modules [excluding the core components mod_core, mod_so, mod_win32 and the winnt mpm] into individual loadable modules, so the administrator may individually disable the former compiled-in modules by simply commenting out their LoadModule directives. [William Rowe] *) Saved Win32 module authors and porters many future headaches, by duplicating the appropriate .h files such as os.h into the include directory, including in the build tree. [William Rowe] Also noticed that version stamp resources weren't generated for proxy modules, this too is now fixed.

Toggle the /Zi flag to allow all supportd versions of VC (5, 6, 7) to build 'out of the box' in debugging mode.

The purpose of this patch is to toggle the debugging mode (default) to Program Database (from Program Database for Modify on the fly debugging). The net effect of this patch is to clean up all of the irrelevant entries associated with either the debugging or release command line switches, and generally straighten the projects as they would be exported from VC6/SP5. The outcome of this patch is that VC5 users -should- be able to load and build the workspace without any errors (as they used to have no symbols database at all, the /ZI option doesn't work, they had to use cvtdsp.pl to toggle these to /Zi.)

More Versioning

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

The -big- fix, all the proper linkages for BaseAddr.ref plus a bit.

A bit of inclusion for the apr-util package.

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

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

MSVC Project Rename - ApacheModuleBleck.* is no longer... now mod_bleck.* Reviewed by: rbb, stoddard

PR: Obtained from: Submitted by: Reviewed by: All waiting to bite us... just go ahead and ignore this commit. Better now that when we are deciphering real changes. This knocks all the projects into what I expect is a clean VC6 format.

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.

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: Continue removing precompiled header support from the dsp and mak files. Submitted by: William Rowe Reviewed by: Bill Stoddard

Update Windows project and makefiles so dynamically loadable modules get built

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