1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

154 Commits

Author SHA1 Message Date
William A. Rowe Jr
c9148bcd49 This same patch is needed in mod_asis and others, I'm testing the waters
for this solution.  I'm easily convinced to choose AP_MAX_SENDFILE based
  on any reasonable argument, provided it's smaller than 2^30 :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89714 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 21:41:44 +00:00
Ryan Bloom
931fe85b8d First pass at the pipe_of_death logic for the prefork MPM. This does
pass some initial testing, but it needs to be banged on more.  It looks
like if the server gets a lot of requests to restart all at once, there
are potential problems, but other than that this does seem to solve our
current restart issues.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89282 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 00:09:16 +00:00
Ben Laurie
9b7d636ba9 Doxygenation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89261 13f79535-47bb-0310-9956-ffa450edef68
2001-06-03 11:59:18 +00:00
Roy T. Fielding
43b9634ceb Moved util_uri to apr-util/uri/apr_uri, which means adding the apr_
prefix to all of the uri functions (yuck), changing some includes,
and using APR error codes instead of HTTP-specific error codes.

Other notes to test this patch:
- You need to delete the util_uri.h file - exports picks up on this.
- I'd like to remove the apr_uri.h from httpd.h, but that might
  increase the complexity of this patch even further.  Once this patch
  is accepted (in some form), then I can focus on removing apr_uri.h
  from httpd.h entirely.  I need baby steps (heh) right now.
- I imagine that this might break a bunch of stuff in Win32 or other OS
  builds with foreign dependency files.  Any help here is appreciated.

This is a start...  -- justin

Submitted by:	Justin Erenkrantz
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89198 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 01:31:12 +00:00
Roy T. Fielding
a529c242fa Removed the keptalive boolean from conn_rec because it is now only
used by a single routine and can be replaced by a local variable.

Submitted by:	Greg Stein, Ryan Bloom, Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88938 13f79535-47bb-0310-9956-ffa450edef68
2001-04-26 00:33:14 +00:00
Ryan Bloom
eb94b557ee At the hack-athon we decided to change the way that input filters
determine how much data is returned to the previous filter.  Prior to this
change, we used a field in the conn_rec to determine how much to return.
After this change, we use an argument to ap_get_brigade.  This makes it
much more obvious how things work at all levels, so that module authors
can easily determine how much data is supposed to be returned to them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88912 13f79535-47bb-0310-9956-ffa450edef68
2001-04-22 22:19:32 +00:00
Roy T. Fielding
4647e5f71a Revert the change that moved keepalives out of conn_rec. That variable
controls the number of requests per connection, regardless of the protocol
used by the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88908 13f79535-47bb-0310-9956-ffa450edef68
2001-04-21 12:23:37 +00:00
Ryan Bloom
70a67b2c26 Move the keepalives field out of the conn_rec and into an HTTP specific
connection record.  This also moves some HTTP specific back out of the
core and into the HTTP module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88881 13f79535-47bb-0310-9956-ffa450edef68
2001-04-18 03:53:34 +00:00
David Reid
29b5864cbf Silly typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88872 13f79535-47bb-0310-9956-ffa450edef68
2001-04-16 20:33:16 +00:00
William A. Rowe Jr
87217ab618 Whoops... this could be causing problems
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88676 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 01:40:28 +00:00
Brian Havard
1dcd4c9b8f Tweak some declarations so they're picked up by make_export.awk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88568 13f79535-47bb-0310-9956-ffa450edef68
2001-03-24 06:43:19 +00:00
Chuck Murcko
93463cfc17 This is a fix that went into v1.3 quite a while back, but not into v2.0.
It sorts out the problem when a password protected reverse proxy URL
sends a Proxy-Authenticate to a browser instead of a WWW-Authenticate.

This patch covers the changes to the httpd-2.0 tree.

Submitted by:	Graham Leggett
Reviewed by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88527 13f79535-47bb-0310-9956-ffa450edef68
2001-03-16 07:28:08 +00:00
Ben Laurie
e492048855 More doxygenation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88494 13f79535-47bb-0310-9956-ffa450edef68
2001-03-11 23:24:56 +00:00
Ben Laurie
759dfd4d71 First step in doxygen conversion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88490 13f79535-47bb-0310-9956-ffa450edef68
2001-03-11 14:54:13 +00:00
Ryan Bloom
456137c996 Fix a compile break on OS/2, by adding apr_general.h back to httpd.h.
Submitted by:	Brian Havard <brianh@kheldar.apana.org.au>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88322 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 17:09:04 +00:00
Ryan Bloom
192cc6b8a5 Namespace protect IOBUFSIZ since it is a public symbol.
Submitted by:	Jon Travis <jtravis@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88282 13f79535-47bb-0310-9956-ffa450edef68
2001-02-23 00:50:24 +00:00
Greg Stein
dd9b08e321 *) Introduce "ap_conf_vector_t" type to assist with legibility and provide
some type safety. (unfortunately, our old "void*" is type-safe with the
   new one, but over time we should be better)

*) Propagate the new type to all appropriate functions.

*) Random cleaning, whitespace, stylistic nits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88225 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 02:58:53 +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
Jeff Trawick
f1c0b3bf58 string.h needs to be included before monkeying around with strchr et al,
since some system header files do their own monkeying around with those
functions in ways that don't get along with us unless we include their
definitions first

examples: gcc 2.8.1 on Solaris
          gcc 2.95.2 on AIX


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88113 13f79535-47bb-0310-9956-ffa450edef68
2001-02-12 15:44:36 +00:00
Greg Stein
1229603b02 *) remove some obsolete/unused defines from httpd.h.
*) remove DEFAULT_XFERLOG from main.c; it is never set/used
*) move ap_get_max_daemons() to ap_mpm.h
*) move DEFAULT_LISTENBACKLOG to mpm_common.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88103 13f79535-47bb-0310-9956-ffa450edef68
2001-02-12 02:49:56 +00:00
Jeff Trawick
9d684f9e07 I hereby propose that the ASF buy that guy a compiler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87981 13f79535-47bb-0310-9956-ffa450edef68
2001-02-05 12:55:11 +00:00
Ryan Bloom
2fb54c456a Move the APACHE_RELEASE macro to release.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87975 13f79535-47bb-0310-9956-ffa450edef68
2001-02-05 01:12:47 +00:00
Ryan Bloom
31ad32e42e Move the server version information out of httpd.h and into release.h.
This is in preparation of the first tag with the new tag and release
strategy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87973 13f79535-47bb-0310-9956-ffa450edef68
2001-02-05 01:02:27 +00:00
Ryan Bloom
86a67eff47 Move initgroupgs, ap_uname2id and ap_gname2id from util.c to
mpm_common.c.  These functions are only valid on some platforms,
so they should not be in the main-line code.

These functions are also not portable to non-unix platforms, so they don't
really belong in APR.  Since they are only used in MPMs, for right now,
I am moving them to mpm_common.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87755 13f79535-47bb-0310-9956-ffa450edef68
2001-01-20 06:05:15 +00:00
Ryan Bloom
b610678807 Remove ap_chdir_file. This function is not thread-safe, and nobody
is currently using it.  The proper way to do this, is to use the
apr_create_process API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87754 13f79535-47bb-0310-9956-ffa450edef68
2001-01-20 05:18:06 +00:00
Allan K. Edwards
0be0106405 add pool parameter to ap_is_directory and ap_is_rdirectory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87593 13f79535-47bb-0310-9956-ffa450edef68
2001-01-05 20:44:44 +00:00
Jeff Trawick
351725e726 Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87460 13f79535-47bb-0310-9956-ffa450edef68
2000-12-20 16:44:01 +00:00
Ryan Bloom
b5440c348a Force all Apache functions to be linked into the executable, whether they
are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87424 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 17:05:48 +00:00
Jeff Trawick
290df5f182 move closer to IPv6 support by changing the server_addr_rec
representation of the bound address to something which handles
IPv6; this also allows us to switch to APR resolver routines
in places instead of calling gethostbyname() and gethostbyaddr()
directly

Issues remaining with this set of changes:

1) apr_snprintf()'s %pA formatting needs to change to take
   apr_sockaddr_t * instead of sockaddr_in * -OR- just get rid
   of that type of formatting
2) apr_get_inaddr() is no longer used and should be removed


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87363 13f79535-47bb-0310-9956-ffa450edef68
2000-12-15 19:20:12 +00:00
Jeff Trawick
348b5f2ecb Axe ap_get_virthost_addr(). This <address>[:port] parse routine
is not used anymore and it doesn't handle IPv6, so it is best to
drop it.  If/when mod_tls (Netware) is ported to 2.0 it can use
apr_parse_addr_port().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87354 13f79535-47bb-0310-9956-ffa450edef68
2000-12-15 13:28:57 +00:00
Jeff Trawick
b1e8b050e9 The local_addr and remote_addr fields in the conn_rec are now
apr_sockaddr_t * instead of sockaddr_in.  This is a small step
towards IPv6 support.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87342 13f79535-47bb-0310-9956-ffa450edef68
2000-12-14 18:47:30 +00:00
Ryan Bloom
e3ea80ea86 Get the server setup for Beta 1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87315 13f79535-47bb-0310-9956-ffa450edef68
2000-12-12 22:22:51 +00:00
Ryan Bloom
92d3f8aa0d Update the version numbers for a9
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87311 13f79535-47bb-0310-9956-ffa450edef68
2000-12-12 21:38:54 +00:00
David Reid
dee2be1a35 Fix a couple of small typo's
Not raining today...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87155 13f79535-47bb-0310-9956-ffa450edef68
2000-12-02 13:07:45 +00:00
Greg Stein
656a5d3081 Use "const char * const *" for process->argv (which is the correct
const-ness since we sometimes put "some string" in there, and also the CRT's
argv). propagate this change within http_main and mpm/winnt/ (also correct
some other const type usage within the MPM).

fix ab's call to parse_url() which removed a const to actually manipulate an
arg from the CRT's argv (indirectly via opt->arg). no idea how this has
avoided segfaulting.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87130 13f79535-47bb-0310-9956-ffa450edef68
2000-11-29 17:33:03 +00:00
Greg Stein
ead2dae94c *) Compensate for recent changes in the APR headers. Specifically, some
files need to specifically include stdio.h, or a particular apr_*.h
   header.

*) Adjust callers of apr_create_process() to deal with the extra "const"

*) Add "const" to args of ap_os_create_privileged_process()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87080 13f79535-47bb-0310-9956-ffa450edef68
2000-11-26 04:47:43 +00:00
Ryan Bloom
0f5f707689 We are working on a9 now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87048 13f79535-47bb-0310-9956-ffa450edef68
2000-11-21 16:53:33 +00:00
Ryan Bloom
0d8f112d26 Get the version number bumped to 2.0a8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87037 13f79535-47bb-0310-9956-ffa450edef68
2000-11-20 20:10:50 +00:00
David Reid
3dd5f4ad55 Bring the apr_in_addr type into line with naming conventions and make changes
where appropriate.  At least on my system virtual hosts seem to still work :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86895 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 00:58:25 +00:00
Ryan Bloom
4ee1d8eb59 Remove BUFF from the main server. :-) The buff code needs to remain as
a part of the server until the proxy is purged of BUFF however.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86878 13f79535-47bb-0310-9956-ffa450edef68
2000-11-09 00:37:06 +00:00
David Reid
33aabfee3f Start of moving to apr_port_t in the server code. This will probably the first
of a few...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86866 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 11:35:38 +00:00
Greg Stein
2b00b3a71c fix the byterange filter.
there is still some bogosity in there (huge buffer allocs!), and some
optimizations to be made, but this appears to fix byterange handling.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86865 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 11:22:07 +00:00
Greg Stein
754480fd2d Use apr_off_t for the content length, rather than long. Propagate through
the byterange handling and ap_set_content_length().

[ ap_each_byterange() remains as an apr_size_t* so we don't mess up callers ]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86860 13f79535-47bb-0310-9956-ffa450edef68
2000-11-07 22:41:09 +00:00
Sascha Schumann
6d89d14d4e Remove REQUEST_CHUNKED_PASS and change ap_discard_request_body()
to use REQUEST_CHUNKED_DECHUNK.

Because of this change, the need for handle_request_body() is gone,
so we remove that as well.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86827 13f79535-47bb-0310-9956-ffa450edef68
2000-11-03 17:34:59 +00:00
Sascha Schumann
8b890b1157 Comment fixes.. just to get them out of my tree
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86788 13f79535-47bb-0310-9956-ffa450edef68
2000-11-01 18:10:15 +00:00
Jeff Trawick
d7b3bb82c5 Get rid of some outdated character set translation cruft.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86753 13f79535-47bb-0310-9956-ffa450edef68
2000-10-26 11:34:04 +00:00
Manoj Kasichainula
b1fb90877e Add back suexec support.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86712 13f79535-47bb-0310-9956-ffa450edef68
2000-10-23 15:30:57 +00:00
Greg Stein
7dbbeb4504 somebody was a Very Bad Boy when they inserted casts into this function.
casting away the const was absolutely wrong... the warnings were saying the
return value type needed to be fixed. did that and torched the casts.

who still thinks casts are a good idea? :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86668 13f79535-47bb-0310-9956-ffa450edef68
2000-10-19 10:43:03 +00:00
Ryan Bloom
d85bbfb847 This begins to remove BUFF from the server. The idea is to go very slowly
with this.  To begin with, we store both the socket and the BUFF in the
conn_rec.  Functions are free to use which ever they want, in the end all
of the data goes to the same place.  This modifies all of the MPMs except
Windows.  All of the Unix MPMs are working, but the others need to be
tested.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86651 13f79535-47bb-0310-9956-ffa450edef68
2000-10-18 19:12:16 +00:00
Jeff Trawick
61a74c6f66 Capitalize AP_DEBUG_ASSERT(). All macros should shout, even
if their forbearers (e.g., ap_assert()) did not.
Submitted by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86621 13f79535-47bb-0310-9956-ffa450edef68
2000-10-17 01:04:33 +00:00