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

161 Commits

Author SHA1 Message Date
William A. Rowe Jr
4d13f63462 Test _NMAKE_VER define to determine nmake -nologo behavior,
and use $(MAKEOPT) -f syntax throughout to avoid problems
  on mingw, borland, etc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357226 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 20:54:27 +00:00
William A. Rowe Jr
c6ba0c716c Revert 1/2 of my last commit, keep Apache2 as the default name so we don't
need to keep syncing this with releases.

  Retain the other 1/2 - a better message since apr's must be in the build
  tree srclib/ not the install target srclib/.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356852 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 20:14:46 +00:00
William A. Rowe Jr
44d3d40730 Keep default INSTDIR out of a 2.0, 2.2 tree when working in svn trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356844 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 20:07:37 +00:00
William A. Rowe Jr
56bfe10074 Style nit - alpha order is slightly easier to later review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@351703 13f79535-47bb-0310-9956-ffa450edef68
2005-12-02 12:34:40 +00:00
Colm MacCarthaigh
573c18f599 Remove the problematic block which is causing problems with the latest versions
of MSVS. Sacrifice some borland options which don't really work anyway, and for
Borland to work, we'e really going to need a Makefile.bor.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349833 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 23:34:28 +00:00
Colm MacCarthaigh
314e894126 Adding mod_authn_dbd to the Windows build environments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349777 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 18:12:33 +00:00
Colm MacCarthaigh
92e75049b8 Update to reflect the mod_dbd inclusion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349772 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 17:48:35 +00:00
Colm MacCarthaigh
a2a903da53 Correct a syntax error detected by MSVC2005
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349713 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 12:37:03 +00:00
Colm MacCarthaigh
6e1fadb783 Add htcacheclean to Makefile.win (thanks to wrowe for pointers)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290715 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 14:39:53 +00:00
Nick Kew
d2fa38ef90 Move mod_filter and mod_charset_lite from /experimental/ to /filters/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290669 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 09:46:12 +00:00
Sander Striker
4fc1adcc5e * Makefile.win
Fix config installation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178665 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 18:33:23 +00:00
Joshua Slive
ead8a4b2c6 Bring the windows config file in line with the simplifications
of the main httpd.conf.

Make a vain attempt to modify Makefile.win appropriately.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160989 13f79535-47bb-0310-9956-ffa450edef68
2005-04-12 00:12:14 +00:00
William A. Rowe Jr
5d6aa7fbc4 Fix Win32 imap->imagemap transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160432 13f79535-47bb-0310-9956-ffa450edef68
2005-04-07 18:56:56 +00:00
William A. Rowe Jr
4f32c76fb1 Apache.exe -> httpd.exe - per discussion on dev@httpd
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
2005-03-31 19:02:44 +00:00
William A. Rowe Jr
8e1754f89e Reverting a localization I had attempted to fix back on Saturday.
Must have closed the svn commit shell a bit to quickly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154911 13f79535-47bb-0310-9956-ffa450edef68
2005-02-22 23:16:18 +00:00
William A. Rowe Jr
e8d56a8060 pcre.lib is bound into libhttpd.dll - we no longer need to redistribute
yet another third party lib, while we now have an ap_reg* API exported
  and supported by httpd.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154340 13f79535-47bb-0310-9956-ffa450edef68
2005-02-18 20:32:05 +00:00
William A. Rowe Jr
2967295bf5 Deposit mod_bucketeer.so and mod_dumpio.so into the installed apache2
instance.  This does not configure httpd.conf to load them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124276 13f79535-47bb-0310-9956-ffa450edef68
2005-01-05 21:17:09 +00:00
Mladen Turk
30027718dc Update cache module project and modules location from experimental to cache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106897 13f79535-47bb-0310-9956-ffa450edef68
2004-11-29 09:49:55 +00:00
Mladen Turk
b3c6ffe052 Oops. Do not commit private settings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105106 13f79535-47bb-0310-9956-ffa450edef68
2004-09-13 11:02:12 +00:00
Mladen Turk
70410ee481 Add proxy_ajp and proxy_balancer to the build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105102 13f79535-47bb-0310-9956-ffa450edef68
2004-09-13 10:31:25 +00:00
William A. Rowe Jr
e8f3249f5d Catch up for Win32 to authnz_ldap changes, and make win32's module
for util_ldap features named mod_ldap.so as on Unix.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104921 13f79535-47bb-0310-9956-ffa450edef68
2004-08-31 20:11:35 +00:00
André Malo
de6b6ff89d add dsp and exp file for mod_log_forensic
incorporate into Win32 build


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103454 13f79535-47bb-0310-9956-ffa450edef68
2004-04-19 18:34:59 +00:00
André Malo
ef27028114 nobody came up with another patch or objections and it should not get lost:
add mod_version and invoke it into *x (modules = all) and win32 builds


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103345 13f79535-47bb-0310-9956-ffa450edef68
2004-04-11 16:37:43 +00:00
William A. Rowe Jr
e6abb6c9ff Bugfix 2 - fix the rest of the subst codes for ssl.conf on Win32.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102968 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 21:20:15 +00:00
William A. Rowe Jr
221dd6f4dd whoops - moving to fast - fix 1.135 to exclude the appropriate
makefile section if ssl.conf is unneeded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102962 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 20:01:07 +00:00
William A. Rowe Jr
de2dbe78ee Bugfix 1; if no ssl, no reason for ssl.conf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102960 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 19:59:18 +00:00
André Malo
1779ef9bb4 revert the zlib.lib linkage patch. Bill Rowe said, it's worse than before.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102385 13f79535-47bb-0310-9956-ffa450edef68
2004-01-21 20:55:22 +00:00
André Malo
5daffde295 Don't include zlib files directly. That's very nasty!
zlib is now ivoked in a more common way (we link against it :-).
The build process inclusion is probably not the final one, but it works
for me for zlib 1.1.4 and 1.2.1 in command line builds.

PR: 25578


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102370 13f79535-47bb-0310-9956-ffa450edef68
2004-01-18 17:01:46 +00:00
William A. Rowe Jr
445504f7c5 By rights this should be a subst - but it gets us building.
Need to revisit pulling this and httpd-std.conf.in so we can
  drop all win32 specifics.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101199 13f79535-47bb-0310-9956-ffa450edef68
2003-09-08 21:08:33 +00:00
William A. Rowe Jr
628f4331da Account for apr-1.lib and apriconv-1.lib changes, HTTPD 2.1/APR 1.0 only.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101193 13f79535-47bb-0310-9956-ffa450edef68
2003-09-08 15:17:25 +00:00
William A. Rowe Jr
506a96c123 After much discussion on dev@apr - it turns out that .dbg files served
a very limited purpose and their extraction interfered with the correct
  extraction of the (much more useful) .pdb files.  Eliminating them now.

  It also turns out that without the _src.pdb files for static libraries,
  one cannot build debuggable modules with any locals or type information.
  We need to copy those _src.pdb files into lib/ as well.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98969 13f79535-47bb-0310-9956-ffa450edef68
2003-03-11 00:37:05 +00:00
André Malo
69a71265ec the symbols target in apr-iconv disappeared...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98963 13f79535-47bb-0310-9956-ffa450edef68
2003-03-10 23:18:37 +00:00
William A. Rowe Jr
60928f86e5 Fix Sebastian's observed failure of the Win32 Debug _install target.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98734 13f79535-47bb-0310-9956-ffa450edef68
2003-02-19 16:52:16 +00:00
William A. Rowe Jr
f44daed2fe Thanks Andre... for pointing out my fat fingers.
Drop the module binaries into the correct location.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98606 13f79535-47bb-0310-9956-ffa450edef68
2003-02-10 15:45:40 +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
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
8eca9047fd .dsw IDE builds were building mod_auth_ldap, while .mak builds were not.
Corrected, and cleaned up redundant util_ldap dependency.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98346 13f79535-47bb-0310-9956-ffa450edef68
2003-01-19 02:46:55 +00:00
William A. Rowe Jr
38e1abb41e Fix the last bit of build breakage from promoting ext_filter from
experimental to filters.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98319 13f79535-47bb-0310-9956-ffa450edef68
2003-01-18 02:26:45 +00:00
William A. Rowe Jr
be4c212ce7 It's up to apr-iconv to install it's own ces/ccs .pdb symbols.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98279 13f79535-47bb-0310-9956-ffa450edef68
2003-01-15 15:15:12 +00:00
William A. Rowe Jr
0ea421117c Adapt to Brane's apr-iconv patch that provides for make install, and makes
httpd a little less intimate with apr internals.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98267 13f79535-47bb-0310-9956-ffa450edef68
2003-01-14 18:28:13 +00:00
William A. Rowe Jr
d86c4b87f2 Not entirely clear if we should trust iconv or bin/iconv as the target
path for iconv modules, but here goes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97762 13f79535-47bb-0310-9956-ffa450edef68
2002-12-03 06:19:36 +00:00
William A. Rowe Jr
988446b81b Catch up with Trawick's change to filters/mod_ext_filter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97591 13f79535-47bb-0310-9956-ffa450edef68
2002-11-22 01:05:22 +00:00
William A. Rowe Jr
10323a2306 Inject logio into the win32 build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97376 13f79535-47bb-0310-9956-ffa450edef68
2002-11-01 17:55:12 +00:00
William A. Rowe Jr
cbb609a5a5 A quick-n-dirty hack. Expose the auth_provider api from mod_auth_basic
alone, on Win32 only.

  Requires mod_auth_basic be loaded prior to using mod_auth_digest or any
  other mod_authn/z modules.

  Win32 builds again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96794 13f79535-47bb-0310-9956-ffa450edef68
2002-09-13 21:55:31 +00:00
William A. Rowe Jr
d6d8198522 Welcome to the new schema. Multiply defined symbols blow.
Don't expect things to compile right now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96785 13f79535-47bb-0310-9956-ffa450edef68
2002-09-13 16:39:03 +00:00
William A. Rowe Jr
5f73bac20e Reenable apr-iconv for ongoing development effort. Sorry that we had
to defer this, but building with the patch [which will be placed in
  patches] will allow anyone to build an xlate-enabled aprutil for ongoing
  svn and other development.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96323 13f79535-47bb-0310-9956-ffa450edef68
2002-08-09 15:05:43 +00:00
William A. Rowe Jr
b32d860599 Since library detection is _not_ complete, and this code is extremely
alpha quality, backout the apr-iconv for Win32 changes from the .40
  release.  Many have objected [not -1 exactly] to forcing iconv for any
  user to build xlate, and the detection/fixup patches are a blocker for
  releasing this overdue version.

  Recommiting immediately after tagging this sans-iconv point for .40, and
  create a patch anyone can apply to enable this for the release tarball.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96322 13f79535-47bb-0310-9956-ffa450edef68
2002-08-09 15:01:45 +00:00
Bill Stoddard
61c0be7990 Win32: Install libapriconv
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96239 13f79535-47bb-0310-9956-ffa450edef68
2002-07-30 17:07:44 +00:00
William A. Rowe Jr
79a715fb3f Until we are building loadable iconv modules, the core iconv will always
be carried around with aprutil.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96134 13f79535-47bb-0310-9956-ffa450edef68
2002-07-21 00:24:32 +00:00
William A. Rowe Jr
ffbad94d87 No reason not to build charset_lite anymore on Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96122 13f79535-47bb-0310-9956-ffa450edef68
2002-07-19 08:51:48 +00:00