summaryrefslogtreecommitdiff
path: root/httpd.dsp
Commit message (Collapse)AuthorAgeFilesLines
* Windows manifests are ;1 for .exe, ;2 for .dll and .so - ref: ↵Thomas J. Donovan2008-06-111-2/+2
| | | | | | http://msdn.microsoft.com/en-us/library/ms235591.aspx git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@666726 13f79535-47bb-0310-9956-ffa450edef68
* Embed the .manifest files of all httpd binaries as a post-buildWilliam A. Rowe Jr2007-01-111-0/+12
| | | | | | | | | | 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
* Revert Revision 397647William A. Rowe Jr2006-07-061-2/+2
| | | | | | | | 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
* This resource /D syntax was pretty horridly imported into VS 2005,William A. Rowe Jr2006-04-271-2/+2
| | | | | | change the quotation to ensure a peaceful transition to sln/vcproj files. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397647 13f79535-47bb-0310-9956-ffa450edef68
* Remove all /machine:I386 references, these are getting in the wayWilliam A. Rowe Jr2006-04-271-5/+5
| | | | | | | | 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
* s|/GX |/EHsc | because they were always synonyms, and Visual StudioWilliam A. Rowe Jr2006-04-191-1/+1
| | | | | | 2005 edition complains bitterly and loudly that /GX is deprecated. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395419 13f79535-47bb-0310-9956-ffa450edef68
* Remove a host of dependencies upon awk, using the same template forWilliam A. Rowe Jr2006-04-191-31/+2
| | | | | | | | | | | | 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
* Reintroduce stack frame construction with /Oy- (removal was implied by /O2).William A. Rowe Jr2005-05-151-1/+1
| | | | | | | | | 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
* Catch up with Apache.exe->httpd.exe rename; it seems svn rn can'tWilliam A. Rowe Jr2005-04-071-19/+19
| | | | | | be combined with svn commit and source changes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160441 13f79535-47bb-0310-9956-ffa450edef68
* Apache.exe -> httpd.exe - per discussion on dev@httpdWilliam A. Rowe Jr2005-03-311-0/+128
| | | | | | | | 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
* This change eliminates the intermediate httpd.lib from the build ofWilliam A. Rowe Jr2001-01-181-464/+0
| | | | | | | | | | | | 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
* Correction, commited the vc5. Need vc6 in the tree. Humble appologies.William A. Rowe Jr2000-12-211-3/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87475 13f79535-47bb-0310-9956-ffa450edef68
* The Win32 overhaul, in summary;William A. Rowe Jr2000-12-211-21/+20
| | | | | | | | | | | | 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
* And this gets Apache for Windows compiling from the command line andBill Stoddard2000-12-061-22/+21
| | | | | | | | | | | | | 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
* We build through Apache.exe!!! Onwards...William A. Rowe Jr2000-12-051-41/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87220 13f79535-47bb-0310-9956-ffa450edef68
* Windows project file update to accomodate the new directory structure.Bill Stoddard2000-12-051-93/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87215 13f79535-47bb-0310-9956-ffa450edef68
* This patch illustrates the new locations, and makes the majority of theWilliam A. Rowe Jr2000-12-051-70/+70
| | | | | | | adjustments. Now to actually try to build the thing. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87212 13f79535-47bb-0310-9956-ffa450edef68
* Get WIN32 building againAllan K. Edwards2000-12-041-14/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87180 13f79535-47bb-0310-9956-ffa450edef68
* Make Win32 build againWilliam A. Rowe Jr2000-11-291-2/+35
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87129 13f79535-47bb-0310-9956-ffa450edef68
* Improve legability for new Win32 hackers (I hope)William A. Rowe Jr2000-10-231-172/+172
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86722 13f79535-47bb-0310-9956-ffa450edef68
* That's the end of things broken this morning... now to try Jeff's patchWilliam A. Rowe Jr2000-10-181-2/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86648 13f79535-47bb-0310-9956-ffa450edef68
* Fix compile break in Win32William A. Rowe Jr2000-10-161-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86611 13f79535-47bb-0310-9956-ffa450edef68
* Nice to see we build again on Win32William A. Rowe Jr2000-10-161-4/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86610 13f79535-47bb-0310-9956-ffa450edef68
* Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbolsWilliam A. Rowe Jr2000-10-161-2/+2
| | | | | | | | | | 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
* Regardless of reaction to a symbol rename -within- the sources, theseWilliam A. Rowe Jr2000-10-111-5/+6
| | | | | | | external symbols change for clarity. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86540 13f79535-47bb-0310-9956-ffa450edef68
* First cut at a file bucket. Modify the core_filter to handle useBill Stoddard2000-09-211-0/+4
| | | | | | | of apr_sendfile(). Modify ap_send_fd() to use the new file bucket. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86278 13f79535-47bb-0310-9956-ffa450edef68
* Add ap_buckets_pipe.c and remove iol_socket and iol_fileBill Stoddard2000-08-241-8/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86144 13f79535-47bb-0310-9956-ffa450edef68
* Add a couple of new bucket functions to the Win32 project file.Bill Stoddard2000-08-221-1/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86129 13f79535-47bb-0310-9956-ffa450edef68
* Win32: Add bucket brigades and util_filter to the project file.Bill Stoddard2000-08-151-0/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86077 13f79535-47bb-0310-9956-ffa450edef68
* Add a useful headerWilliam A. Rowe Jr2000-08-091-0/+4
| | | | | | | | | | PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86034 13f79535-47bb-0310-9956-ffa450edef68
* Win32: Add util_xml.c to ApacheCore.Bill Stoddard2000-08-081-6/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86028 13f79535-47bb-0310-9956-ffa450edef68
* Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...William A. Rowe Jr2000-08-061-5/+26
| | | | | | | | | | | | | 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
* fix the Win32 build w.r.t recent iol_socket changesGreg Stein2000-07-031-2/+2
| | | | | | | Submitted by: Keith Wannamaker git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85750 13f79535-47bb-0310-9956-ffa450edef68
* Add mpm.h to the src/modules/mpm/winnt directory (it's empty for now, but ↵Bill Stoddard2000-06-131-10/+5
| | | | | | | | | | its presense is required for http_core.c, et. al.). Update ApacheCore.dsp to pick it up in the include path. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85564 13f79535-47bb-0310-9956-ffa450edef68
* PR:William A. Rowe Jr2000-06-061-8/+9
| | | | | | | | | | | Obtained from: Submitted by: Reviewed by: Fix a silly oversight. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85440 13f79535-47bb-0310-9956-ffa450edef68
* PR:William A. Rowe Jr2000-06-061-46/+42
| | | | | | | | | | | | | | | | | | | | 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
* PR:William A. Rowe Jr2000-06-051-10/+14
| | | | | | | | | | | | | | 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
* PR:William A. Rowe Jr2000-05-281-7/+39
| | | | | | | | | | | | | | | | 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
* William A. Rowe Jr2000-05-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85309 13f79535-47bb-0310-9956-ffa450edef68
* Win32: Convert ap_proc_t to tranparent type.Bill Stoddard2000-05-241-6/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85292 13f79535-47bb-0310-9956-ffa450edef68
* William A. Rowe Jr2000-05-191-4/+7
| | | | | | | | | | | 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85254 13f79535-47bb-0310-9956-ffa450edef68
* This commit will most likely break everybody on Windows. The .dspRyan Bloom2000-05-171-5/+3
| | | | | | | | | 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
* William A. Rowe Jr2000-05-171-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85235 13f79535-47bb-0310-9956-ffa450edef68
* William A. Rowe Jr2000-05-061-2/+2
| | | | | | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85162 13f79535-47bb-0310-9956-ffa450edef68
* William A. Rowe Jr2000-05-061-8/+4
| | | | | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85161 13f79535-47bb-0310-9956-ffa450edef68
* William A. Rowe Jr2000-05-011-7/+7
| | | | | | | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85121 13f79535-47bb-0310-9956-ffa450edef68
* PR:William A. Rowe Jr2000-04-291-4/+0
| | | | | | | | | | | | 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
* Revamp the Win32 make environment. Makefiles have been removed andBill Stoddard2000-04-201-6/+56
| | | | | | | | | | | | 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
* linkwin20.diffs Resolves:Bill Stoddard2000-04-171-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Win32: First cut at getting mod_isapi working under 2.0Bill Stoddard2000-04-151-0/+4
| | | | | | | Submitted by: William Rowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84976 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status