Add util_fcgi.h and associated definitions and support routines for FastCGI, based largely on mod_proxy_fcgi.

Inform MSVC compiler there is a Lexical target so the compiler is not confused which causes it to absorb some properties of the Lexical target into the Debug target.

add util.regex.c to MPM, had been unneeded untill r1200055

Add ap_varbuf API for resizable buffers. Increase length limit of lines in the configuration file to 16MB. Increase length limit of lines in the group file to 16MB. PR: 45888, 50824, 43084 Windows and Netware build changes are untested.

Pick up Jeff's layout refactoring on win32.

mpm_default.h is just a convenience for a specific MPM with 2.3+; it isn't installed (this is the only definition at present for DEFAULT_REL_RUNTIMEDIR on Windows, but that needs to be solved separately)

Fix some Windows build issues

The path is likely changing, in the meantime restore win32 build to success

Here's the simpler solution to the two groups of mappers/ modules... The mod_so and mod_watchdog are truly not mappers/ at all. Very open to better names than modules/core/ but these are clearly API's which are to be consumed by the httpd core, or generically, any module.

MPM's are now dynamically loadable; so must mod_watchdog be. The only module with an excuse now is mod_so which implements LoadModule itself.

drop mpm.h

Add watchdog module to win32 build. Since it can only operate as static module reference it inside modules.c

httpd 2.x is further modular; presume pcre is yet another .dll

mod_core.h is moved

add util_cookies

Introduce ap_expr expression parser API

Add util_mutex, although it's not used much by windows since we generally only support 'default', the proven event model for windows.

Make buildmark.c compilation consistent, especially for VC8

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.)

Add our new eor_bucket.c module to libhttpd

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

Add /D PCRE_STATIC to solve an 'exported symbol imported' bug. We build pcre static, and do not intent to export pcre_* namespace, but rather our ap_pcre_* wrappers.

Get httpd-2.1 building once again on win32. NEVER NEVER screw around with redeclaring AP_ macros and constants. If the compiler won't pick them up, e.g., AP_DECLARE, ya've done something wrong from the start. All httpd/ap headers depend on httpd.h - plain and simple, so this un-convolutes the unusual order here. STATIC has become PCRE_STATIC, along with some other odd definitions. The only remaining emit is that _pcre_free export is imported, which implies something is unusual with the declaration. Still researching.

Initial pass at refactoring some files to eliminate our 150K C source behemoths. * Makefile.in: Change order of dependencies to bring in exports.o first so that we have every symbol 'used' before the linker starts processing. * build/rules.mk.in: Add a 'program-install' target which just copies httpd. * server/Makefile.in, modules/http/config2.m4: Add in new file targets. * NWGNUmakefile, libhttpd.dsp: Blind updates for Netware and Win32. (I tried.) * server/core.c: Move core_input_filter, net_time_filter, and core_output_filter and all supporting functions to... * server/core_filters.c (copied): ...here. * modules/http/http_protocol.c: Move functions from here to there...namely: * modules/http/byterange_filter.c (copied): Relocate ap_byterange_filter() and friends. * modules/http/chunk_filter.c (copied): Relocate chunk_filter(). * modules/http/http_etag.c (copied): Relocate ap_set_etag and ap_make_etag(). * modules/http/http_filters.c (copied): Relocate ap_http_filter(), ap_http_header_filter(), ap_discard_request_body(), ap_setup_client_block(), ap_should_client_block(), and ap_get_client_block().

Nobody objected: <IfModule> now takes the module identifier in addition to the filename. CAUTION: this commit breaks the build on netware. It still needs to be adjusted. (but I don't have any netware knowledge...) Also, developers need to re-run buildconf on unices. PR: 29003 Submitted by: Edward Rudd <eddie omegaware.com>, Andr� Malo

Revert a change to the link flags that were accidentally committed.

add eoc_bucket.c to project

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.

revert my recent patch. util_debug is no longer needed :)

*gna* get/set_module_config are now defined in util_debug.c. We have to link against it.

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]

Sort targets (no effective change) - this reduces the cvs diff when modifing the project file from the IDE.

Integrate mod_ident with the Win32 build. Submitted by David Shane Holden <dpejesh@yahoo.com>

Update libhttpd.dll filenames to reflect the .dll extension for the newest apr/build/win32ver.awk script changes. Submitted by Mladen Turk.

Fix up Win32 build. Submitted by: Sebastian Bergmann <lists@sebastian-bergmann.de> Reviewed by: Justin Erenkrantz (not really, but...)

Refactor out the child behavior from mpm_winnt. This is the first step in making a legible multiprocess windows mpm, or at least structuring the code to always begin a new child as an old one is going to die soon, rather than waiting for it's final dying breath. The only code that had to be affected [due to the split and general structure of the code] was merging the set_listeners_noninherited() code directly into the get_listeners_from_parent code, and also into the apr socket.c code for winnt. For the most part the code splits rather nicely.

Reorganize a bit for legibility.

And the other one...

$(IntDir) doesn't go back to VC5

Get rid of the buildmark bogosity. It never helped ide users, and usually just hurt command line users. If we have to link, we need a buildmark, so perform the buildmark compilation as a 'manual' pre-link step every time a link is required.

Try this AGAIN. Move ap_regkey.h to include/ and assure that this time, it contains defined(WIN32)||defined(DOXYGEN) requirements to prevent the other platform exports from barfing. Please ack if this works for you.

Small whitespace cleanup.

Fix alpha order so the .dsp list isn't rearranged on save.

Move the last little useful bit of registry.c into services.c, and blast it. All Win32 registry foo is going through ap_regkey now.

Incorporate ap_regkey.c into the build.

Whoops. Others need to peek into include and cgi module structures.

We appear to never have had any complaints about copy srcname dstname not overwriting dstname ... this flavor is certain not to emit a file exists error [with the obvious caviat - if it's write protected, your problem.] Much simpler than /y, <.y or set copycmd fooness.

Tired of 'foo.h not found' messages in the build. Checked ms's docs, seems xcopy's /y arg goes all the way back to Win95. This shouldn't introduce any hassles.

Outch! DougM reports that I never committed this file. Lo and behold, he was right. Sorry I killed the NT build for a few days!

*) 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.

Reimplement Win32 registry-based and shebang-extended scripting. Accepts arguments of $* and %* for 'positioned' cgi envvars, provided they stand alone (aren't part of another arg.) Accepts %1 $1 syntax, quoted or not, but makes no attempt at palacating older programs with short paths, just yet. About as stable and robust as my first rewrite of dir_walk, so watch out!

Just feels wrong... but need to continue building

Accomodate the new server/util_time.c module on win32

Clip a duplicate appearance

Regroup some of the headers in the win32 module, to make the distinction between modules/http and server/ a bit clearer.

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.)

Spell it right, per Mr. Coar

Add auto-generated Win32 versioning.

(hopefully) get WinNT MPM to build using mpm_common.c code; a few notes: . the selection of ap_sock_disable() is certainly ugly, but that may need to be cleaned up in a different manner... . the directive functions couldn't be AP_DECLARE() if they are to be compatible with AP_INIT_TAKExxx(); this is an old restriction

Fix up files constituting the Win32 libhttpd project file

get rid of util_date.c/util_date.h and associated test program test_date.c

Blew it... forgot to transpose dsp versions

Get win32 libhttpd building without uri_delims, now added to apr-util

A one line snafu becomes a big one... sorry, forgot to transpose this.

Minor snafu - wrong intermediate build path

Another chunk of code from http to core. This should continue to build on all platforms. The next job is to shuffle functions back and forth so that the server builds without mod_http.

Move more code from the http module into the core server. This is core code, basically the default handler, the default input and output filters, and all of the core configuration directives. All of this code is required in order for the server to work, with or without HTTP. The server is closer to working without the HTTP module, although there is still more to do. I tried to fix Windows, but somebody should probably make sure I did it correctly.

Moved to modules/arch/win32/

Fix Windows compile breaks caused by mod_core.h foobar

Begin to move functions from the http module to the core. The goal is to have only functions that are HTTP specific in the http directory.

Hmmm... ap_release.h is a good file to list in the IDE.

Fix Windows compile break caused by move of error_bucket.c

Begin restructuring scoreboard code to enable adding back in the ability to use IPC other than shared memory. Get mod_status working on Windows again. Still to do: Rename some of the function APIs. Replace all calls to reinit_scoreboard with ap_create_scoreboard. Add back in support for scoreboard files.

Add newly invented mod_include.h to the project view

Sunny and warm (if 30`F meets your definition of warm :-)

Clearing out the libhttpd.def from win32

Fixups to build the whole shebang once again.

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

Fix compile break in 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.

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.