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

78 Commits

Author SHA1 Message Date
Guenter Knauf
0e8878ded1 removed obsolete -prefix; minor cosmetic changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@563191 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 17:01:03 +00:00
Bradley Nicholes
786636766c Implement a BASEDIR build environment variable to allow the NetWare build to relocate the install files
Submitted by: Guenter Knauf <fuankg apache org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@505572 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 23:59:15 +00:00
William A. Rowe Jr
003a033071 Add .manifest post-processing to the httpd build for users of VC 8
(Studio 2005, 'free' Express or full edition) command line builds.

Backports 495126, adjusted for debugging/debug path change between
trunk and 2.2 branch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495130 13f79535-47bb-0310-9956-ffa450edef68
2007-01-11 05:44:54 +00:00
Ruediger Pluem
cb1f0f291a Merge r452213 from trunk:
* Fix precedence problem.

PR: 40658
Submitted by: Larry Cipriani <lvc lucent.com>
Reviewed by: rpluem, niq, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@452462 13f79535-47bb-0310-9956-ffa450edef68
2006-10-03 12:49:42 +00:00
William A. Rowe Jr
50d63a7fe6 Sync to httpd/trunk where we've reverted the /d "LONG_NAME=foo bar" syntax,
which confuses the ability of MS VS 6 to export makefiles.

  Also syncs the fix to some debug/release targets observed by hunter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@429039 13f79535-47bb-0310-9956-ffa450edef68
2006-08-05 20:19:08 +00:00
Roy T. Fielding
ae1748a99f update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 03:38:44 +00:00
William A. Rowe Jr
913de3b472 This resource /D syntax was pretty horridly imported into VS 2005,
change the quotation to ensure a peaceful transition to sln/vcproj files.

Backports: 397647

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@397651 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:51:48 +00:00
William A. Rowe Jr
967c94daee 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.)

Backports: 397407

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@397649 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:47:41 +00:00
William A. Rowe Jr
9b1b56ab68 After appropriate time sitting on trunk, and some review by our
win32 builders, eliminate platform-specific use of 'awk' to create
  our .rc resources.  (Deliberately waited until a clean 2.2.2 was
  pulled from the branch.)  The end goal is to make building simpler
  for our 'free' VisualStudio 2005 Express users, to encourage more
  end users to explore the source code.  Eliminating thousands of
  lines of build-script is a nice side effect.

Backports: 395418

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396974 13f79535-47bb-0310-9956-ffa450edef68
2006-04-25 20:24:55 +00:00
Paul Querna
786089eef9 Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68
2006-04-22 01:53:06 +00:00
William A. Rowe Jr
84871ce3fe Backport 395419, replace /GX win32 compile flag with /EHsc to match.
Reviewed by all active win32 contributors, and committed as an arch
  maintenance fix.  This permits Win32 VisualStudio 2005 users to build
  httpd without extranious 'deprectated option' emits.

Reviewed by: wrowe, colm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395961 13f79535-47bb-0310-9956-ffa450edef68
2006-04-21 17:47:19 +00:00
Colm MacCarthaigh
8ffd8c554b Update the last year of copyright for the 2.2.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395231 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:33:16 +00:00
Jim Jagielski
0f7b6563e8 Merge r345053 from trunk:
No functional change: remove "internal" tab spacing/formatting.



Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@345239 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 13:39:15 +00:00
Jim Jagielski
b3181bddae No functional change: remove trailing whitespace. This also means
that "blank" lines, which had consisted of just spaces
and/or tabs are now truly blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332309 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:20:05 +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
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 00:12:39 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
Joe Orton
7cced87bd7 * modules/echo/mod_echo.c (process_echo_connection): Fix brigade
handling: don't re-use a passed brigade.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103965 13f79535-47bb-0310-9956-ffa450edef68
2004-06-15 20:27:17 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
31fc2b38f4 fix copyright date according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102558 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 11:36:35 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
Joe Orton
c4aa600023 Use -export-dynamic only when linking an httpd which includes mod_so,
not when linking modules or support programs.

* modules/aaa/config.m4, modules/arch/win32/config.m4,
modules/cache/config.m4, modules/echo/config.m4,
modules/filters/config.m4, modules/generators/config5.m4,
modules/metadata/config.m4: Don't add -export-dynamic to LT_LDFLAGS.

* modules/mappers/config9.m4: Add -export-dynamic to HTTPD_LDFLAGS
when mod_so is enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102235 13f79535-47bb-0310-9956-ffa450edef68
2004-01-08 20:47:29 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
William A. Rowe Jr
3f9f757b4e A few odd .dsp's to help testers and developers along (really irrelevant
for binary or default builds.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99869 13f79535-47bb-0310-9956-ffa450edef68
2003-05-16 18:19:39 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
Bradley Nicholes
7d357a59bf Adding the current version string to the link of each NLM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97251 13f79535-47bb-0310-9956-ffa450edef68
2002-10-16 23:52:35 +00:00
Bradley Nicholes
d24232b7dc Updating the NLM descriptions in the NetWare make files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97241 13f79535-47bb-0310-9956-ffa450edef68
2002-10-16 16:03:44 +00:00
Cliff Woolley
3e2ce19baf BUCKET FREELISTS
Add an allocator-passing mechanism throughout the bucket brigades API.

From Apache's standpoint, the apr_bucket_alloc_t* used throughout a given
connection is stored in the conn_rec by the create_connection hook.  That
means it's the MPM's job to optimize recycling of apr_bucket_alloc_t's --
the MPM must ensure that no two threads can ever use the same one at the
same time, for instance.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94304 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 08:17:26 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Bradley Nicholes
e6d10bff2d Switching from a project build file to GNU make files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93665 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 22:21:25 +00:00
Justin Erenkrantz
94d01b65aa Change ap_get_brigade prototype to remove *readbytes in favor of readbytes.
If you need the length, you should be using apr_brigade_length.  This is
much more consistent.  Of all the places that call ap_get_brigade, only
one (ap_http_filter) needs the length.  This makes it now possible to
pass constants down without assigning them to a temporary variable first.

Also:
- Change proxy_ftp to use EXHAUSTIVE mode (didn't catch its -1 before)
- Fix buglet in mod_ssl that would cause it to return too much data in
  some circumstances


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93014 13f79535-47bb-0310-9956-ffa450edef68
2002-01-25 01:11:47 +00:00
Justin Erenkrantz
7d32242a14 Input filtering prototype change: Socket blocking type should be
separate from the input filter mode type.

We also no longer look at readbytes to determine the method of
filter operation.  This makes the use of filters more obvious and
allows a wider range of options for input filters modes.

To start with, the new input filter modes are:

AP_MODE_READBYTES (no more than *readbytes returned)
AP_MODE_GETLINE (old *readbytes == 0 case)
AP_MODE_EATCRLF (old AP_MODE_PEEK)
AP_MODE_SPECULATIVE (will be used in a future ap_getline rewrite)
AP_MODE_EXHAUSTIVE (old *readbytes == -1 case)
AP_MODE_INIT (special case for NNTP over SSL)

The block parameter is an apr_read_type_e: APR_BLOCK_READ, APR_NONBLOCK_READ

This also allows cleanup of mod_ssl's handling in the getline case.

Reviewed by:	Ryan Bloom (concept), Greg Stein (concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92928 13f79535-47bb-0310-9956-ffa450edef68
2002-01-19 07:45:18 +00:00
William A. Rowe Jr
30d1548be6 Fix a handful of AP_MODULE_DECLARE_DATA exports for .so modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92805 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 09:11:33 +00:00
William A. Rowe Jr
6d654c07cd Based on the VC6 switch - and pulling the win32 make files from cvs
- some more ignores are in order.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90274 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 07:19:08 +00:00
William A. Rowe Jr
ebf7a3fe03 Ignore goodness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90250 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 23:14:06 +00:00
Ryan Bloom
3bed613696 Remove a warning from mod_echo.
Submitted by:	Ian Holsman <ianh@cnet.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90128 13f79535-47bb-0310-9956-ffa450edef68
2001-08-13 02:06:05 +00:00
Ryan Bloom
f4fb429209 Make mod_echo use filters for all communication with clients.
Submitted by:	Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89279 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 21:28:20 +00:00
Roy T. Fielding
8ea5039bdb Fix httpd's definition of LTFLAGS to be consistent with that of apr
and apr-util, allow it to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS to replace what we were
formally abusing as LTFLAGS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89094 13f79535-47bb-0310-9956-ffa450edef68
2001-05-12 03:48:31 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
Ryan Bloom
c33b25a3dd Remove a couple more NULL handler specifications.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87662 13f79535-47bb-0310-9956-ffa450edef68
2001-01-12 01:08:22 +00:00
Ken Coar
322f19da6b This sets an example for this type of module, so let's make sure
it uses our own guidelines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87636 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 22:55:13 +00:00
William A. Rowe Jr
8a5e3208d9 Last of the Win32 goodness I've noticed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87503 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 21:07:18 +00:00
Greg Stein
9787943f19 *) remove STANDARD_LIBS line; it is unused/unneeded
*) simplify by removing the extra AC_DEFUN() in each file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87247 13f79535-47bb-0310-9956-ffa450edef68
2000-12-07 10:40:01 +00:00
Ryan Bloom
c512685df5 Ignore all the files that are generated during a build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87195 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 03:48:26 +00:00
Ryan Bloom
d412995055 Get the modules configuration stuff working correctly. This just deals
with STANDARD modules and Protocol, not MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87186 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 21:38:51 +00:00
Ryan Bloom
a87a761b37 Start to add back the config.m4 and Makefile.in's that were separated out
during the repository move.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87184 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 20:34:48 +00:00