1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

144 Commits

Author SHA1 Message Date
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 23:02:04 +00:00
Graham Leggett
24634602eb Remove unused variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206330 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 21:18:25 +00:00
Jim Jagielski
bf2fc8ee54 Use ap_pass_brigade_fchk()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205423 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 15:01:42 +00:00
Eric Covener
57b853536b mod_negotiation: don't return non-AP_FILTER_ERROR filter return values
to ap_run_handler() when sending a body directly from a type-map.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205274 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 03:36:22 +00:00
Eric Covener
c45e14b246 refactor to pull setting of Accept-Ranges header into http_protocol.c which
had been copied to other handlers.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166663 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 12:56:08 +00:00
Stefan Fritsch
02e91f38f6 Fix parsing of Content-Length in type maps
PR: 42203
Submitted by: Nagae Hidetake <nagae eagan jp>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147557 13f79535-47bb-0310-9956-ffa450edef68
2011-07-17 08:52:35 +00:00
Jeff Trawick
782c711893 fix some dead assignments found by the clang analyzer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098162 13f79535-47bb-0310-9956-ffa450edef68
2011-04-30 21:18:58 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
Nick Kew
10c2d6bb52 mod_negotiation: Preserve query string over multiviews negotiation.
PR 33112
Joergen Thomsen


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@915407 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 16:16:04 +00:00
Ruediger Pluem
d38a0de056 * Escape pathes of filenames in 406 responses to avoid HTML injections and
HTTP response splitting.

PR: 46837
Submitted by: Geoff Keating <geoffk apple.com>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@752812 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 09:29:53 +00:00
Roy T. Fielding
421ee8b008 Disabled DefaultType directive and removed ap_default_type()
from core.  We now exclude Content-Type from responses for which
a media type has not been configured via mime.types, AddType,
ForceType, or some other mechanism.  MMN major bump to NZ time.

PR: 13986



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@739382 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 19:12:51 +00:00
Jim Jagielski
6722138c87 more tab cleanups
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@667277 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 22:28:32 +00:00
Dirk-Willem van Gulik
862722ebf4 Sub-requests are created and used with two purposes; sometimes
simply to 'see' what a request would do; as to fill out an SSI,
validate access or similar - and is then discarded. And sometimes
as the precursor to becoming the actual request; e.g. when mod_dir
checks if an /index.html can be served for a '/'.

In the latter case it is important to preserve the output filters
'for real'; whereas in the first case they have to be reset to
purely the minimal proto filters (if at all). This patch instates
the output filters in 3 cases where sub-requests are/may in fact
be used as the real request later on.

This is a relatively risky change (which should not be back-ported 
without further discussion) and may break caches in combination 
with internal redirects/vary/negotiation in subtle ways.

See the thread starting at [1] and in particular the general 
concerns of rpluem at [2] with respect to sub requests 
and (fast_)internal redirects possibly needing a more 
thorough overhaul.

1: http://mail-archives.apache.org/mod_mbox/httpd-dev/200802.mbox/ajax/%3c335D1A4B-25E2-4FF1-8CDF-5010A7FBD293@webweaving.org%3e
2: http://mail-archives.apache.org/mod_mbox/httpd-dev/200802.mbox/%3c47ACE1D4.4060702@apache.org%3e



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@620133 13f79535-47bb-0310-9956-ffa450edef68
2008-02-09 15:04:57 +00:00
Nick Kew
57104f62f0 mod_negotiation: preserve Query String in resolving a type map
PR 33112.  Report with patch by Jørgen Thomsen.
Attention called to it by Per Jessen.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@565671 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 09:22:15 +00:00
Roy T. Fielding
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
Joe Orton
c13f8dd6eb * server/core.c (default_handler): Use apr_brigade_insert_file() to
append the file to the brigade.

* server/protocol.c (ap_send_fd),
modules/proxy/mod_proxy_http.c (spool_reqbody_cl), 
modules/cache/mod_mem_cache.c (recall_body),
modules/cache/mod_disk_cache.c (recall_body),
modules/mappers/mod_negotiation.c (handle_map_file),
modules/generators/mod_asis.c (asis_handler),
modules/dav/fs/repos.c [DEBUG_GET_HANDLER] (dav_fs_deliver),
modules/arch/win32/mod_isapi.c (ServerSupportFunction): Likewise.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@414238 13f79535-47bb-0310-9956-ffa450edef68
2006-06-14 13:16:29 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
Ruediger Pluem
e6e065d38c * Minor performance tweak by reusing already calculated strlen in get_body.
Submitted by: Christophe Jaillet <christophe.jaillet wanadoo.fr>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345686 13f79535-47bb-0310-9956-ffa450edef68
2005-11-19 20:59:16 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Paul Querna
2a286fd49e Check an alternative return value for when a file or directory does not exist. Previously this would return a forbidden on the documentation website for any URL ending in .html.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@219879 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 11:20:33 +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
André Malo
a800869190 parse content-length correctly using apr_strtoff function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103769 13f79535-47bb-0310-9956-ffa450edef68
2004-05-25 20:16:19 +00:00
André Malo
73666bee49 save some cycles
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103768 13f79535-47bb-0310-9956-ffa450edef68
2004-05-25 20:01:23 +00:00
André Malo
49fb28b385 don't return forbidden, if the file was just not found.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103419 13f79535-47bb-0310-9956-ffa450edef68
2004-04-17 00:19:16 +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
3d75c8c079 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102572 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:27:14 +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
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
Jeff Trawick
aa21671e13 switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
2003-09-03 19:27:12 +00:00
André Malo
72016f800a make sure, the preferred language gets its chance, even when it's not
listed in browser's accept-language list.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99709 13f79535-47bb-0310-9956-ffa450edef68
2003-05-04 23:40:20 +00:00
André Malo
3cbaec5d04 mod_negotiation: quality values are now parsed independent from
the current locale. level values are now really parsed as integers.

PR: 17564
Reviewed by: Dirk-Willem van Gulik


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98964 13f79535-47bb-0310-9956-ffa450edef68
2003-03-10 23:36:18 +00:00
André Malo
1b48ec9f5a Extend mod_negotiation to evaluate the environment variables
no-gzip and gzip-only-text/html the same way as mod_deflate does.

(it drops all non-identity encodings, not only gzip)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98871 13f79535-47bb-0310-9956-ffa450edef68
2003-03-01 23:57:32 +00:00
André Malo
f75c3b0051 fix style and WS issues. No code changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98867 13f79535-47bb-0310-9956-ffa450edef68
2003-03-01 21:29:00 +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
André Malo
a439b73022 Introduce "prefer-language" environment variable,
which allows to influence the negotiation process on request basis
to prefer a certain language, e.g.:

SetEnvIf Request_URI ^/manual/foo/ prefer-language=foo


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98512 13f79535-47bb-0310-9956-ffa450edef68
2003-01-28 02:31:27 +00:00
William A. Rowe Jr
3d93b5a99f Set the appropriate mime response headers for negotated type-map
Body: responses.

  wrowe's review;
    My earlier concern doesn't apply.  Type maps have always required the
    author to be explicit in all header fields to be negotiated; if the
    headers aren't given in the type map file the resulting redirect
    (for non-body maps) is broken anyways.  As to my other concern, the
    charset should only exist if the Content-Type was given.

Submitted by: Andr� Malo <nd@perlig.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97648 13f79535-47bb-0310-9956-ffa450edef68
2002-11-25 19:02:44 +00:00
Jeff Trawick
26f1f5a040 use memcpy() instead of strncpy() since strncpy() is more expensive but
none of its extra function is needed


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97562 13f79535-47bb-0310-9956-ffa450edef68
2002-11-18 14:13:53 +00:00
Jeff Trawick
8dcdcbde4d don't lose const looking for that '/'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96334 13f79535-47bb-0310-9956-ffa450edef68
2002-08-09 19:21:57 +00:00
William A. Rowe Jr
e85db78eaa Security rollup for 2.0.40 release. Tag and roll baby.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96327 13f79535-47bb-0310-9956-ffa450edef68
2002-08-09 17:00:44 +00:00
William A. Rowe Jr
a6ac024104 catch up with the apr_atoll -> apr_atoi64 rename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96299 13f79535-47bb-0310-9956-ffa450edef68
2002-08-03 19:36:33 +00:00
Wilfredo Sanchez
a47715f8fe Replace atol() calls which should return long long with apr_atoll() calls.
Submitted by: Shantonu Sen <ssen@apple.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96179 13f79535-47bb-0310-9956-ffa450edef68
2002-07-24 20:47:28 +00:00
Victor J. Orlikowski
d982829aa1 Continue the Bill Rowe apr_size_t crusade.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95993 13f79535-47bb-0310-9956-ffa450edef68
2002-07-10 06:01:14 +00:00
Jeff Trawick
50bac91072 stop using APLOG_NOERRNO in calls to ap_log_[pr]error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95150 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 11:24:17 +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
Bill Stoddard
d5c24720dc Commit 1 of 2 to:
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments on the call to aligh with ap_set_content_length


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94056 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 17:41:55 +00:00
Bill Stoddard
470edb9dd8 First commit to introduce accessor function to set r->content_type..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94027 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 01:58:47 +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
Sander Striker
40d1a65be5 Resolve the issue Jeff pointed out in his recently added comment. That
is, prevent a possible segfault or finding a tag in reused memory.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93854 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 13:30:24 +00:00
Jeff Trawick
89c2a46020 add a comment to point out a potential segfault
tweak an existing comment to make it a little more clear


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93853 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 11:48:32 +00:00
William A. Rowe Jr
3d4731f15d Address the issue raised on list that users with a LanguagePriority
directive alone expect 'ForceLanguagePriority Prefer' behavior even
  if that directive is omitted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93383 13f79535-47bb-0310-9956-ffa450edef68
2002-02-13 02:55:17 +00:00