1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-28 11:57:22 +03:00
Commit Graph

624 Commits

Author SHA1 Message Date
William A. Rowe Jr
d461e059e3 Clean up 2nd typo of the same line, backports 580535
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@580536 13f79535-47bb-0310-9956-ffa450edef68
2007-09-29 02:49:18 +00:00
William A. Rowe Jr
945d7c8b01 Fix typo, backports r580532
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@580533 13f79535-47bb-0310-9956-ffa450edef68
2007-09-29 02:40:46 +00:00
William A. Rowe Jr
35c0ae7ac7 Change to Experimental module to avoid an ever-expanding brigade,
absorb the buckets we've consumed.  Better ways to do this lurk here.

Backport: r580206

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@580219 13f79535-47bb-0310-9956-ffa450edef68
2007-09-28 05:01:44 +00:00
William A. Rowe Jr
cb12933ef1 Sync build changes, current to r569249, modulo those modules which
don't correpond between 2.3-dev and 2.2.

Introduces ALL=1 flag that will cause the modules which are only
interesting to developers to be built.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@569261 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 06:00:44 +00:00
William A. Rowe Jr
06cda105dd Corrected signedness error in mod_case_filter_in 'experiment'.
Partial Backport: r569220

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@569260 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 05:57:28 +00:00
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
André Malo
7634b2c735 newlines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@531930 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 13:32:55 +00:00
Bradley Nicholes
f1895c33e2 Add the case_flt experimental modules to the NetWare build
Submitted by: Guenter Knauf <fuankg apache.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@517472 13f79535-47bb-0310-9956-ffa450edef68
2007-03-13 00:08:52 +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
Jeff Trawick
492e695c40 merge from trunk (but preserve ap_get_server_version()):
*) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  ap_get_server_version() is now 
     deprecated, and is replaced by ap_get_server_banner() and 
     ap_get_server_description().

Reviewed by: rpluem, jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68
2006-09-15 13:19:25 +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
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
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
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
Jim Jagielski
ec2468d2ae No functional change: detab all indenting to be consistent
with our formatting standards.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332307 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:15:41 +00:00
Bradley Nicholes
cbbda38ec5 Fix up the NetWare make files after some of the module moved out of experimental
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@325916 13f79535-47bb-0310-9956-ffa450edef68
2005-10-17 15:47:32 +00:00
Nick Kew
8823ac1663 Sync module moves (dbd, filter, charset_lite) and dbd updates with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307440 13f79535-47bb-0310-9956-ffa450edef68
2005-10-09 14:31:40 +00:00
Nick Kew
5d9267da8b Backport recent fixes from trunk (hitherto lost in branch confusion)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292771 13f79535-47bb-0310-9956-ffa450edef68
2005-09-30 15:31:40 +00:00
Colm MacCarthaigh
69b359cfdc Backport the Doxygen changes to the 2.2.x branch. No functional changes,
however backporting these doxygen fixes makes it significantly easier to diff
trunk and the 2.2.x branch, to sort out what's what. And we might as well
release with nicer doxygen markup.

Submitted by: Neale Ranns <neale ranns.org>
Reviewed by:  Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292540 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 20:44:53 +00:00
Nick Kew
4e2d0a4998 mod_dbd:
(1) Export new ap_dbd_prepare function
  (2) Put all dbd_open() stuff in one place
  (3) Remove the servertoken


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@234017 13f79535-47bb-0310-9956-ffa450edef68
2005-08-20 10:36:50 +00:00
Nick Kew
39d6c7d5c5 Add const-ness to apr_dbd_driver_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231464 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 14:12:13 +00:00
Nick Kew
614849d27a Update mod_dbd to API that hides apr_dbd_driver_t struct.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231275 13f79535-47bb-0310-9956-ffa450edef68
2005-08-10 16:05:17 +00:00
Joe Orton
d3f1127215 * modules/experimental/mod_filter.c (filter_trace): Fix gcc
-Wformat-security warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225725 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 08:00:43 +00:00
Joe Orton
9687f8c6a7 Update remaining 2004 copyright notices.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190592 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 13:54:34 +00:00
Nick Kew
e696c7a4cf Fix up header in mod_dbd.h (I remembered .c but not .h before previous commit)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170730 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 09:23:20 +00:00
Nick Kew
b5198abba6 Committing mod_dbd as new.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170729 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 09:19:34 +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
Joe Orton
a0570c8746 Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:

* configure.in: Add srclib/pcre to the include path.

* include/ap_regex.h: Renamed from include/pcreposix.h.  Prefix all
constants with AP_; prefix all functions and types with ap_.  Define
AP_DECLARE to nothing if necessary.  Remove regcomp error codes.

* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.

* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types.  (ap_regexec, ap_regerror): Removed.

* server/Makefile.in: Build util_pcre.c.

* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above.  Use APR includes.  (ap_regerror): Use apr_snprintf.

* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.

* modules/*: Update to use new type and constant names.

PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:00:41 +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
William A. Rowe Jr
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 05:33:44 +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
Bradley Nicholes
1918883c39 Move mod_cache out of experimental for the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106757 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 20:42:00 +00:00
Bradley Nicholes
da062b024d Add mod_filter to the NetWare build.
Submitted by:normw bocnet.com.au

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106745 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:40:49 +00:00
Justin Erenkrantz
63dd4623e1 At long last, promote mod_cache and friends out of experimental/.
Also, take quick pass through docs files to remove experimental label for them.

Reviewed by: Paul Querna, Bill Stoddard, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106737 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:06:48 +00:00
Nick Kew
9e804e259e Use ap_log_cerror and loglevel debug in filter_trace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106691 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 08:04:01 +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
Justin Erenkrantz
3380d808ed mod_disk_cache: Remove a bunch of non-implemented garbage collection
and cache size directives that are now available through htcacheclean.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105699 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 07:56:20 +00:00
Joe Orton
5da2cc3d8e * modules/experimental/mod_disk_cache.c (recall_headers,
create_entity): Remove unused variables.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105686 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 21:51:12 +00:00
Nick Kew
6f349a2b3d PR: 29709,32051
Submitted by: Gabriel Kalkuhl
Add warning notice about basing code on mod_example.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105679 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 10:04:16 +00:00
Nick Kew
fc0a01f194 Fix compile trouble.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105648 13f79535-47bb-0310-9956-ffa450edef68
2004-11-01 10:00:52 +00:00
Nick Kew
62f6d3d6bd Change FilterDeclare/FilterProvider semantics as discussed in
http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=109899588616670&w=2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105646 13f79535-47bb-0310-9956-ffa450edef68
2004-10-31 18:00:43 +00:00
Nick Kew
a5278a9c0b Fixup broken handling of range header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105613 13f79535-47bb-0310-9956-ffa450edef68
2004-10-28 13:21:08 +00:00
Nick Kew
8bed492892 Fix mod_filter to support the case where a provider sets its own f->ctx
in its filter_init [grumble about filter_init ....]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105604 13f79535-47bb-0310-9956-ffa450edef68
2004-10-27 10:46:26 +00:00
Nick Kew
ae6b8dcb99 Move ap_filter_provider_t back out of public API
(suggested by nd; makes sense to niq)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105603 13f79535-47bb-0310-9956-ffa450edef68
2004-10-27 09:20:33 +00:00
Jean-Jacques Clar
ac4c881fba fixed a type match warning on NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105594 13f79535-47bb-0310-9956-ffa450edef68
2004-10-25 16:08:09 +00:00
Justin Erenkrantz
41ee74561c mod_cache: Add CacheIgnoreHeaders directive.
(Justin made some minor tweaks to the patch.)

PR: 30399
Submitted by:	R�diger Pl�m <r.pluem@t-online.de>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105569 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 17:45:55 +00:00
Paul Querna
923e847ade use the correct struct for CacheDisable.
(cache_disable instead of cache_enable)

PR: 31128
Submitted by: Edward Rudd <eddie omegaware.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105510 13f79535-47bb-0310-9956-ffa450edef68
2004-10-18 00:49:31 +00:00
André Malo
a9a11aab67 allow <= and >= for filter dispatcher
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105507 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 18:31:44 +00:00
André Malo
bb5a48b58e minor optimizations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105506 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 17:05:59 +00:00
André Malo
9336f02135 style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105505 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 16:58:10 +00:00