1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-20 04:06:16 +03:00
Commit Graph

830 Commits

Author SHA1 Message Date
Sander Striker
33b7519c9d Bump after the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96333 13f79535-47bb-0310-9956-ffa450edef68
2002-08-09 19:18:59 +00:00
Sander Striker
9555d66d9e Getting ready for the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96325 13f79535-47bb-0310-9956-ffa450edef68
2002-08-09 15:18:38 +00:00
Jeff Trawick
0de649efa3 fix a compile problem in util_ldap.c when APU_HAS_LDAP_NETSCAPE_SSL
PR:                10324


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96260 13f79535-47bb-0310-9956-ffa450edef68
2002-07-31 15:43:15 +00:00
Jeff Trawick
8250a84889 if APR doesn't support threads, we don't need (and can't have) these
thread mutexes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96243 13f79535-47bb-0310-9956-ffa450edef68
2002-07-30 19:31:35 +00:00
Jeff Trawick
2f1325c13a untabify
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96242 13f79535-47bb-0310-9956-ffa450edef68
2002-07-30 18:27:14 +00:00
Bill Stoddard
f2a8d4f419 Fix the PATH exposure security problem I thought I fixed in 2.0.36.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96240 13f79535-47bb-0310-9956-ffa450edef68
2002-07-30 18:14:47 +00:00
William A. Rowe Jr
837d08b5f5 Cut-n-paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96135 13f79535-47bb-0310-9956-ffa450edef68
2002-07-21 03:28:51 +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
19108b12ab Fix comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96018 13f79535-47bb-0310-9956-ffa450edef68
2002-07-11 19:53:04 +00:00
Brian Pane
97b9c76435 Strength-reduce a 64-bit "mod 16" operation to "& 0xf" in cached_explode()
just in case the compiler doesn't do it for us


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96012 13f79535-47bb-0310-9956-ffa450edef68
2002-07-11 16:08:58 +00:00
William A. Rowe Jr
4b4e274fd6 Fix code comments
Submitted by:	Stas Bekman <stas@stason.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96007 13f79535-47bb-0310-9956-ffa450edef68
2002-07-11 06:14:30 +00:00
Jeff Trawick
07f1257cc1 tweak a comment for readability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95972 13f79535-47bb-0310-9956-ffa450edef68
2002-07-08 16:27:54 +00:00
Brian Pane
4ea071cb68 fix ap_mpm_set_max_mem_free declaration to match mpm_common.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95958 13f79535-47bb-0310-9956-ffa450edef68
2002-07-04 22:39:03 +00:00
Brian Pane
de4e29fdad Add missing declarations of the new max_mem_free stuff
so prefork will compile


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95957 13f79535-47bb-0310-9956-ffa450edef68
2002-07-04 17:54:49 +00:00
Brian Pane
708e1d6117 Re-use the same temp brigade to read all lines of a request header,
to avoid the overhead of brigade creation and deletion.  (This produced
a 5% reduction in the total CPU usage of a minimalist httpd configuration:
<JHEPKCEMGPKFFDHHDDKDMELFEKAA.bill@wstoddard.com>)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95956 13f79535-47bb-0310-9956-ffa450edef68
2002-07-04 17:05:25 +00:00
William A. Rowe Jr
660bd019fb Bring in os.h after we let apr do its platform foo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95928 13f79535-47bb-0310-9956-ffa450edef68
2002-07-01 17:49:53 +00:00
Justin Erenkrantz
798c1dae43 Add a filter_init function to the filters so that a filter can execute
arbitrary code before the handlers are invoked.

This resolves an issue with incorrect 304s on If-Modified-Since mod_include
requests since ap_meets_conditions() is not aware that this is a dynamic
request and it is not possible to satisfy 304 for these requests (unless
xbithack full is on, of course).  When mod_include runs as a filter, it is
too late to set any flag since the handler is responsible for calling
ap_meets_conditions(), which it should do before generating any data.

If a module doesn't need to run such arbitrary code, it can just pass NULL
as the argument and all is well.

PR:	9673
Reviewed by:	Ryan Bloom and others


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95906 13f79535-47bb-0310-9956-ffa450edef68
2002-06-28 08:40:25 +00:00
Justin Erenkrantz
f3792f4f86 Fix doxygen comments and add a missing line-feed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95898 13f79535-47bb-0310-9956-ffa450edef68
2002-06-27 05:32:20 +00:00
Justin Erenkrantz
001b387bcd Change conn_rec->keepalive to an enumerated value of
AP_CONN_UNKNOWN
AP_CONN_CLOSE
AP_CONN_KEEPALIVE

This also fixes a problem where ap_discard_request_body would not discard
the body when keepalive was 0.  This actually meant the keepalive status
was unknown *not* closed, but no one ever remembered that.

This problem was seen with mod_dav sending error responses (as reported by
Karl Fogel).

Suggested by:	Greg "this isn't the '80s" Stein
Reviewed by:	Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95891 13f79535-47bb-0310-9956-ffa450edef68
2002-06-26 19:45:07 +00:00
William A. Rowe Jr
d545963de7 Add in the other complex ap_regkey_value_foo() fns and move ap_regkey.h
Out Of The Way of exports stumbling onto it!!!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95879 13f79535-47bb-0310-9956-ffa450edef68
2002-06-24 07:50:36 +00:00
William A. Rowe Jr
14111fd4ca Introduce win32 registry handling through a very apr-ish interface.
Deals with apr utf-8 encoding of filesystem values, so we preserve
  strings in any locality or nationalized flavor of WinNT, and avoid
  the gunk for Win9x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95875 13f79535-47bb-0310-9956-ffa450edef68
2002-06-24 04:50:41 +00:00
Brian Pane
b2fe8e6f27 Removed "tolower(++s)" idiom from ap_strcasestr(), to avoid side-effects
on any platform with a macro-based tolower() that references its argument
multiple times.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95867 13f79535-47bb-0310-9956-ffa450edef68
2002-06-23 09:01:22 +00:00
William A. Rowe Jr
0801cef84c With dav corrected, this last _compat.h bogosity leaves the core distro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95863 13f79535-47bb-0310-9956-ffa450edef68
2002-06-23 06:43:26 +00:00
William A. Rowe Jr
8d6c820a34 Revert to the 1.39 comments about NULL for ap_sub_req_lookup() next_filter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95848 13f79535-47bb-0310-9956-ffa450edef68
2002-06-22 19:39:45 +00:00
William A. Rowe Jr
c959a9ace8 Note the changed meaning of the NULL next_filter argument to the
ap_sub_req_lookup() family, and fix a few oddball cases (those are,
  PATH_TRANSLATED reference issues.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95844 13f79535-47bb-0310-9956-ffa450edef68
2002-06-22 16:32:45 +00:00
Cliff Woolley
508019a5bc bump after the tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95726 13f79535-47bb-0310-9956-ffa450edef68
2002-06-17 16:11:06 +00:00
Cliff Woolley
73a5efad5f here goes nothing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95725 13f79535-47bb-0310-9956-ffa450edef68
2002-06-17 16:06:06 +00:00
Cliff Woolley
b80ce70357 moving on. :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95718 13f79535-47bb-0310-9956-ffa450edef68
2002-06-16 19:44:45 +00:00
Cliff Woolley
99d6cf6ded bump before the tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95715 13f79535-47bb-0310-9956-ffa450edef68
2002-06-16 19:40:04 +00:00
Aaron Bannert
1c58975c55 Improve on some of the documentary comments in the request_rec.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95700 13f79535-47bb-0310-9956-ffa450edef68
2002-06-15 19:19:42 +00:00
William A. Rowe Jr
7af68c0bf5 Solve the 80/20 by initializing and storing server_rec->timeout and
server_rec->keep_alive_timeout in apr_time_interval_t format (in apr
  units, whatever they be), as both values exist to pass into APR, and
  all APR timeouts are in apr_time_t.

Reviewed by:	Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95623 13f79535-47bb-0310-9956-ffa450edef68
2002-06-12 23:59:31 +00:00
Cliff Woolley
01a0d0685f Bump after the tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95608 13f79535-47bb-0310-9956-ffa450edef68
2002-06-11 05:36:04 +00:00
Cliff Woolley
9a565540c1 bump before the tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95605 13f79535-47bb-0310-9956-ffa450edef68
2002-06-11 05:29:21 +00:00
Justin Erenkrantz
8cf0d317fd Style cleanups before contemplating adding init filter hook.
(No functional changes)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95582 13f79535-47bb-0310-9956-ffa450edef68
2002-06-08 03:05:06 +00:00
Bill Stoddard
cef791d3e8 Update comments for Stas Bekman
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95506 13f79535-47bb-0310-9956-ffa450edef68
2002-06-04 19:01:05 +00:00
Cliff Woolley
f35e891531 The recent changes require a full recompile. Lack thereof has bitten
both me and Justin today.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95475 13f79535-47bb-0310-9956-ffa450edef68
2002-06-02 22:29:16 +00:00
Ryan Bloom
ca5fd7fb7b The apr_bucket change requires a minor MMN bump. Also modify Apache's
filters to use APR_BUCKET_IS_METADATA macro.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95454 13f79535-47bb-0310-9956-ffa450edef68
2002-05-31 20:52:28 +00:00
Cliff Woolley
ebfb28f986 fix some major badness: error buckets *cannot* use simple_copy because
they're not simple buckets.  they have a private data structure which
gets freed.  if you're going to copy them and share whatever ->data points
to (which is what simple_copy does), you have to refcount the structure,
which is the whole point of apr_bucket_refcount and apr_bucket_shared_copy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95421 13f79535-47bb-0310-9956-ffa450edef68
2002-05-31 05:03:09 +00:00
Justin Erenkrantz
6e02b15f7a Add macro to check for an error bucket. (Can't call it APR_BUCKET_IS_ERROR
since error bucket is private to httpd - hence the AP_ prefix.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95410 13f79535-47bb-0310-9956-ffa450edef68
2002-05-30 21:08:21 +00:00
Justin Erenkrantz
5607afff2b Add a PROXYREQ_RESPONSE value for request_rec->proxyreq because it is
possible that there can be different behavior at the protocol level if
request_rec isn't really a request but a response.

This stems from the fact that request bodies must be indicated by
Content-Length or Transfer-Encoding, but response bodies do not.  The
recent change to ap_http_filter to return EOS if there isn't a body broke
proxy.  Therefore, there must be some way for the proxy to indicate that
this is a response.  Accordingly, ap_http_filter can allow the BODY_NONE
iff this is a response.

Since r->proxyreq is set to PROXYREQ_PROXY even for the original request
from the client, that value isn't sufficient.  Hence, the introduction of
PROXYREQ_RESPONSE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95390 13f79535-47bb-0310-9956-ffa450edef68
2002-05-30 07:04:45 +00:00
Cliff Woolley
4055e1db50 Imagine the horror. I go to try compiling PHP4, and it bombs out on
r->boundary.  BUT WAIT, I say, we have a test in there for that:
#if !MODULE_MAGIC_AT_LEAST(20020506,0).  The test doesn't seem to be
working.  That's odd, I think.  So I go look at the ap_mmn.h.  Egad,
the tests are totally backwards.  How on earth are we going to handle this?
Surely it's wrong in 1.3.x as well.  So I go look.  Nope, turns out it
got fixed TWO YEARS AGO in that repository.  Sigh.  Anyway, thanks Greg.
:)

Submitted by:	Greg Stein, circa Apache 1.3.13


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95388 13f79535-47bb-0310-9956-ffa450edef68
2002-05-30 05:57:33 +00:00
Cliff Woolley
afd258bde7 Yet another reason the MMN needs to get bumped. If there are changes
that anyone's been holding off on because they would affect the MMN, might
as well get them in now so we minimize the number of releases with MMN
changes.  I believe there are more renames pending in APR that should be
done sooner rather than later, for example.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95381 13f79535-47bb-0310-9956-ffa450edef68
2002-05-30 05:04:32 +00:00
Jeff Trawick
0547e6e6e9 Add "-k start|startssl|restart|graceful|stop" support to httpd
for the Unix MPMs.  These have semantics very similar to the
old apachectl commands of the same name.

The use of stderr/stdout and exit status for error conditions
needs to be revisited.  For now it matches apachectl behavior.

Justin Erenkrantz got the ball rolling with this feature.  Some
of his support code was used unchanged.  Other code was shuffled
around and modified or rewritten.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95237 13f79535-47bb-0310-9956-ffa450edef68
2002-05-23 12:58:37 +00:00
Jeff Trawick
6fba81114c add ap_log_pid() for reading an Apache pid file
Submitted by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95235 13f79535-47bb-0310-9956-ffa450edef68
2002-05-23 12:19:09 +00:00
Jeff Trawick
3d54d08394 ignore APLOG_NOERRNO; note that it is deprecated
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95148 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 10:48:06 +00:00
Brian Pane
d74c4014cc Added EnableMMAP directive to allow the server administrator to
prevent mmap of file buckets upon read.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95040 13f79535-47bb-0310-9956-ffa450edef68
2002-05-11 23:24:29 +00:00
Brian Pane
bc90009198 Moved ap_setup_make_content_type() declaration to http_protocol.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95031 13f79535-47bb-0310-9956-ffa450edef68
2002-05-10 15:08:59 +00:00
Justin Erenkrantz
fc40b68507 Removing a field in a core structure (r->boundary) merits a MMN bump,
unfortunately.  They got 2 GAs out of the old MMN.

Reviewed by:	Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94947 13f79535-47bb-0310-9956-ffa450edef68
2002-05-06 08:21:10 +00:00
Justin Erenkrantz
105cb01305 Rewrite ap_byterange_filter so that it can work with data that does not
have a predetermined C-L - such as data that passes through mod_include.
Previously, these requests would generate 416 since when the byterange
filter ran, r->clength would be 0.  r->clength is only guaranteed to
be valid after C-L filter is run, but we need C-L to run after us so
that our data can have a proper C-L returned.  So, we need to rearrange
the code so that we can deal with this case.

Highlights:
- Remove r->boundary since it is possible to have this self-contained in
  boundary's ctx.  (May require MMN bump?)
- Remove call to parse_byteranges in ap_set_byterange since this would
  wrongly return -1 for dynamic responses.  We have to wait until we
  see EOS to call parse_byteranges.
- Move bound_head computation inside the num_parts == 2 check.
- Change a NULL brigade check to APR_BRIGADE_EMPTY
- Move the 416 error return to after we've run through all ranges and
  found none of them to be valid.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94942 13f79535-47bb-0310-9956-ffa450edef68
2002-05-06 07:43:40 +00:00
William A. Rowe Jr
107f38eed0 Demote to a minor bump for .36 - those affected by API changes should
be a very small subset of modules.  Here are the afflicted types & fns;

apr_explode_time      -> apr_time_exp_tz
apr_explode_localtime -> apr_time_exp_lt
apr_get_groupname     -> apr_group_name_get

deprecated apr_lock_t, apr_os_lock_t and fns, but the warnings
have been there a while so no sympathy.

added dav_hooks_search_t and DASL Search functions.

added apr_cmdtype_e *type arg to mod_cgi opt fn ap_cgi_build_command.

added proxy_fixups hook and ap_proxy_ssl_disable, and
optional fn ssl_engine_disable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94859 13f79535-47bb-0310-9956-ffa450edef68
2002-04-29 12:51:31 +00:00