1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

73 Commits

Author SHA1 Message Date
William A. Rowe Jr
6df9b82d20 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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419644 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 18:36:23 +00:00
William A. Rowe Jr
b2820e8da8 This resource /D syntax was pretty horridly imported into VS 2005,
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
2006-04-27 21:41:29 +00:00
William A. Rowe Jr
f65c47bd75 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).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397407 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 05:30:39 +00:00
William A. Rowe Jr
663687ae8e s|/GX |/EHsc | because they were always synonyms, and Visual Studio
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
2006-04-19 22:51:02 +00:00
William A. Rowe Jr
862d0e231e 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.)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395418 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:47:49 +00:00
William A. Rowe Jr
b773db2f0e Add our new eor_bucket.c module to libhttpd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357612 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 02:08:38 +00:00
William A. Rowe Jr
20d06d7a06 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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00
William A. Rowe Jr
f48468c68b 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157949 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 17:52:03 +00:00
William A. Rowe Jr
e681eb22c8 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154207 13f79535-47bb-0310-9956-ffa450edef68
2005-02-17 23:45:16 +00:00
Justin Erenkrantz
439221058c 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().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106692 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 08:07:44 +00:00
André Malo
7accf16eed 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103849 13f79535-47bb-0310-9956-ffa450edef68
2004-06-04 22:40:47 +00:00
Sander Striker
c9788a00d7 Revert a change to the link flags that were accidentally committed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102864 13f79535-47bb-0310-9956-ffa450edef68
2004-03-05 18:52:01 +00:00
Allan K. Edwards
4f210746aa add eoc_bucket.c to project
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102834 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 17:49:52 +00:00
William A. Rowe Jr
281948b722 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98970 13f79535-47bb-0310-9956-ffa450edef68
2003-03-11 00:58:59 +00:00
André Malo
5735ea2fdf revert my recent patch. util_debug is no longer needed :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98929 13f79535-47bb-0310-9956-ffa450edef68
2003-03-07 19:49:19 +00:00
André Malo
a17233ec71 *gna* get/set_module_config are now defined in util_debug.c. We have
to link against it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98914 13f79535-47bb-0310-9956-ffa450edef68
2003-03-07 00:53:48 +00:00
William A. Rowe Jr
25ac108fe2 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98743 13f79535-47bb-0310-9956-ffa450edef68
2003-02-20 15:56:04 +00:00
William A. Rowe Jr
e8c0a9532f 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98712 13f79535-47bb-0310-9956-ffa450edef68
2003-02-18 22:07:21 +00:00
William A. Rowe Jr
a45632ba37 *) 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]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98596 13f79535-47bb-0310-9956-ffa450edef68
2003-02-07 21:30:53 +00:00
William A. Rowe Jr
e0469ba7d0 Sort targets (no effective change) - this reduces the cvs diff when
modifing the project file from the IDE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98587 13f79535-47bb-0310-9956-ffa450edef68
2003-02-06 19:21:12 +00:00
William A. Rowe Jr
89d2be9245 Integrate mod_ident with the Win32 build.
Submitted by David Shane Holden <dpejesh@yahoo.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98386 13f79535-47bb-0310-9956-ffa450edef68
2003-01-20 21:38:50 +00:00
William A. Rowe Jr
4fa511075a Update libhttpd.dll filenames to reflect the .dll extension for the
newest apr/build/win32ver.awk script changes.  Submitted by Mladen Turk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98378 13f79535-47bb-0310-9956-ffa450edef68
2003-01-20 18:57:03 +00:00
Justin Erenkrantz
797f3afa2b Fix up Win32 build.
Submitted by:	Sebastian Bergmann <lists@sebastian-bergmann.de>
Reviewed by:	Justin Erenkrantz (not really, but...)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96924 13f79535-47bb-0310-9956-ffa450edef68
2002-09-20 06:06:41 +00:00
William A. Rowe Jr
d1bf15268a 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96221 13f79535-47bb-0310-9956-ffa450edef68
2002-07-29 05:06:20 +00:00
William A. Rowe Jr
b7d7f2fc07 Reorganize a bit for legibility.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96110 13f79535-47bb-0310-9956-ffa450edef68
2002-07-18 06:39:06 +00:00
William A. Rowe Jr
709d68c58f And the other one...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96050 13f79535-47bb-0310-9956-ffa450edef68
2002-07-13 06:33:13 +00:00
William A. Rowe Jr
795ae43468 $(IntDir) doesn't go back to VC5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96049 13f79535-47bb-0310-9956-ffa450edef68
2002-07-13 06:31:17 +00:00
William A. Rowe Jr
e126ac5b0b 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96047 13f79535-47bb-0310-9956-ffa450edef68
2002-07-13 06:20:52 +00:00
William A. Rowe Jr
4008f0e863 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96019 13f79535-47bb-0310-9956-ffa450edef68
2002-07-11 19:57:02 +00:00
William A. Rowe Jr
c372f3d3c9 Small whitespace cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95990 13f79535-47bb-0310-9956-ffa450edef68
2002-07-09 17:26:27 +00:00
William A. Rowe Jr
f0fb164ba3 Fix alpha order so the .dsp list isn't rearranged on save.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95977 13f79535-47bb-0310-9956-ffa450edef68
2002-07-08 18:02:25 +00:00
William A. Rowe Jr
2d68aebd2a 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95880 13f79535-47bb-0310-9956-ffa450edef68
2002-06-24 07:53:50 +00:00
William A. Rowe Jr
5df0355cb3 Incorporate ap_regkey.c into the build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95877 13f79535-47bb-0310-9956-ffa450edef68
2002-06-24 04:55:52 +00:00
William A. Rowe Jr
ce05cbfa43 Whoops. Others need to peek into include and cgi module structures.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95539 13f79535-47bb-0310-9956-ffa450edef68
2002-06-06 01:05:34 +00:00
William A. Rowe Jr
d227cad013 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95265 13f79535-47bb-0310-9956-ffa450edef68
2002-05-24 15:16:53 +00:00
William A. Rowe Jr
abfad02617 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94675 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 03:02:02 +00:00
William A. Rowe Jr
e4f6ae67b7 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!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93953 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 14:57:55 +00:00
William A. Rowe Jr
aff1454d34 *) 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92804 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 08:47:23 +00:00
William A. Rowe Jr
0a9f874084 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!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91613 13f79535-47bb-0310-9956-ffa450edef68
2001-10-21 04:14:24 +00:00
William A. Rowe Jr
f0034b0645 Just feels wrong... but need to continue building
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91490 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 15:36:13 +00:00
William A. Rowe Jr
f8f54edb3f Accomodate the new server/util_time.c module on win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91090 13f79535-47bb-0310-9956-ffa450edef68
2001-09-19 20:22:13 +00:00
William A. Rowe Jr
f7d9719e8b Clip a duplicate appearance
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90755 13f79535-47bb-0310-9956-ffa450edef68
2001-08-28 13:06:34 +00:00
William A. Rowe Jr
4d79bad246 Regroup some of the headers in the win32 module, to make the distinction
between modules/http and server/ a bit clearer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90721 13f79535-47bb-0310-9956-ffa450edef68
2001-08-27 05:33:30 +00:00
William A. Rowe Jr
f0362ccc07 Toggle the /Zi flag to allow all supportd versions of VC (5, 6, 7) to
build 'out of the box' in debugging mode.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90686 13f79535-47bb-0310-9956-ffa450edef68
2001-08-26 05:21:50 +00:00
William A. Rowe Jr
9062307073 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.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90269 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 03:45:35 +00:00
William A. Rowe Jr
8e7232bd11 Spell it right, per Mr. Coar
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90243 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 20:56:03 +00:00
William A. Rowe Jr
964f21d1ba Add auto-generated Win32 versioning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90205 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 07:01:13 +00:00
Jeff Trawick
f29b938e84 (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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90138 13f79535-47bb-0310-9956-ffa450edef68
2001-08-13 16:42:13 +00:00
William A. Rowe Jr
95e427552d Fix up files constituting the Win32 libhttpd project file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89436 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 19:39:15 +00:00
Jeff Trawick
7135d12e6c get rid of util_date.c/util_date.h and associated test program
test_date.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89278 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 19:37:15 +00:00