operation. This ensures the exported (Studio 97 generated) .mak
files create a usable Apache directly from the VC 8 (Studio 2005)
command line environment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@495126 13f79535-47bb-0310-9956-ffa450edef68
While it solves the studio 2005 (we desire this), it breaks
the studio 6 packaging (we require this). Discussion on list
of practical solutions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419644 13f79535-47bb-0310-9956-ffa450edef68
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).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397407 13f79535-47bb-0310-9956-ffa450edef68
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.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395418 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159626 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87715 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87471 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87228 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86609 13f79535-47bb-0310-9956-ffa450edef68
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:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86008 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85435 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85430 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85329 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85309 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85254 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85240 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85235 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85121 13f79535-47bb-0310-9956-ffa450edef68
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85098 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85004 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84982 13f79535-47bb-0310-9956-ffa450edef68
