1
0
mirror of https://github.com/apache/httpd.git synced 2025-09-01 02:02:06 +03:00
Commit Graph

829 Commits

Author SHA1 Message Date
Ryan Bloom
8a75c27537 Add the referer to the error log if one is available.
PR:	73
Submitted by:	Markus Gyger <mgyger@itr.ch>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86951 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 02:42:51 +00:00
Ryan Bloom
b62a882802 Port mod_info to 2.0. This is basically a complete re-write to use the
config tree instead of re-reading the config file.  As a part of this
change, the config tree needs to be exposed to modules as ap_conftree.
Submitted by:	Ryan Morgan <rmorgan@covalent.net>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86948 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 01:55:26 +00:00
Ryan Bloom
1eda38942e Fix type complaints on Xlc.
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86939 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 16:26:42 +00:00
Ryan Bloom
c1c3267c14 Not all platforms have INADDR_NONE defined by default. Apache used to
check for this and the define it if needed.  Since APR also needs this
check it makes more sense for APR to just check and export a symobl that
is always available.
Submitted by:	Branko �ibej <brane@xbc.nu>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86919 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 06:06:00 +00:00
Ryan Bloom
86c61a2932 MM has a bug that when you ask for a specific amount of shared memory
it allocates just that amount.  But, MM actually uses some of it, so we
need to over allocate just a bit.  On 32 bit machines 40 bytes is enough,
but on a 64 bit machine it isn't.  So, we bump it up to 80 bytes until
MM fixes this bug.
Submitted by:	David Hill <David.D.Hill@compaq.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86916 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 21:51:10 +00:00
Ryan Bloom
50758ecf68 Fix a lot of the fallback from the apr_ssize_t to apr_size_t change
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86915 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 19:01:33 +00:00
David Reid
2377bb2ae0 More local/remote changes and tidy up http_vhost a bit.
Also add a new function to get an ap_ina_addr_t from a socket.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86910 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 16:11:14 +00:00
William A. Rowe Jr
cf28fad4b1 Killing ap_os_is_filename_valid. Left actual win32 code, since it is
moving into apr and the check_safe_file call.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86906 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 15:29:07 +00:00
Ryan Bloom
9b2fa16981 This is always displayed to the console. There is no reason to print the
date and time to the console, so we should use APLOG_STARTUP to suppress
them


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86905 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 14:55:27 +00:00
Tony Finch
f971a5552e In mass hosting setups (using mod_vhost_alias or mod_rewrite) where
the hostname is interpolated into the filename, we need to be sure
that the result of interpolation doesn't expose parts of the
filesystem that should be private. This was done by checking the
syntax of the Host: header according to RFC 1123 and RFC 952. However,
many people have broken configurations that violate this syntax
(frequently because they use underscores in their names), and it also
doesn't accommodate the current effort to internationalize the DNS. I
don't think the former is a compelling reason to relax the syntax
checking, but the latter does justify this change.

The only RFC on internationalized DNS at the moment is RFC 2825 which
is an introduction to how difficult the whole thing is; the other
official documentation is a pile of Internet Drafts produced by the
Internationalized Domain Names Working Group of the IETF (with names
starting "draft-ietf-idn-"). However they have very little to say
about URIs, and the current Internet draft about internationalized
URIs (draft-masinter-url-i18n-05) has very little to say about
hostnames :-( On the gripping hand there is some useful information at
<http://www.apng.org/idns/> where there is some iDNS testbed work
going on. The basic idea is that although the format of the hostnames
in the DNS itself remains compatible with RFC 1123, the actual
hostname presented to the resolver is in UTF8, and therefore the
hostname in the URL and Host: header is also in UTF8.

This change relaxes the checking so that only character sequences that
are sensitive to the filesystem are rejected, i.e. forward slashes,
backward slashes, and sequences of more than one dot.

PR: 6635


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86898 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 01:34:46 +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
Bill Stoddard
0d07a2faa3 Clean up compiler warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86892 13f79535-47bb-0310-9956-ffa450edef68
2000-11-09 19:38:26 +00:00
Bill Stoddard
cd0afa6ce2 Eliminate use of BUFF in mpm_winnt. Thanks to rbb for pointing this out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86891 13f79535-47bb-0310-9956-ffa450edef68
2000-11-09 19:17:51 +00:00
David Reid
35034e600c Change the code to reflect the recent API changes...
Alter http_vhost.c to use the new apr_get_inaddr fucntion.  Old code is still
there just in case it breaks.  can someone check it who knows this stuff?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86890 13f79535-47bb-0310-9956-ffa450edef68
2000-11-09 15:09:50 +00:00
William A. Rowe Jr
b09eca4b9e Return buff.h to the winnt mpm till Bill (or I, if I must) remove the
acceptex style contexts into apr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86889 13f79535-47bb-0310-9956-ffa450edef68
2000-11-09 15:00:21 +00:00
Greg Stein
6838403b9e minor tweaks, cleanup, comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86882 13f79535-47bb-0310-9956-ffa450edef68
2000-11-09 10:21:12 +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
Jeff Trawick
e0d2ff0a7a Fix the format strings used for apr_port_t (APR_PORT_T_FMT anyone?).
The sscanf() call was actually broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86871 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 16:42:05 +00:00
David Reid
ee4d19790d This adds the APR_LOCAL/APR_REMOTE to APR and changes the apr_get/set_port
functions to use it.  This is onyl the start and I'll pause a while before
I continue in case people really hate this.  The patch can be backed out and
all evidence will be removed, but I think this makes maintaining/developing
the code easier in the long term.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86870 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 14:47:33 +00:00
David Reid
d31390922c More cleanup of apr_port_t stuff.
This file will need a lot of work as it's using a lot of "raw" information
from socket structures that won't work with IPv6.  Needs to be abstracted out
and use APR instead.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86869 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 12:07:27 +00:00
David Reid
73a6c4c81f Doh! Missed this from the last commit...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86868 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 11:48:09 +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
Ryan Bloom
134dbc9e7a Convert a lot of apr_ssize_t to apr_size_t. We don't ever accept or return
signed values in these integers, and we return the error codes directly,
so we should always report the number of bytes read/written correctly.  If
we have an error, that is 0 bytes.  If that is true, then using signed
values doesn't make any sense.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86857 13f79535-47bb-0310-9956-ffa450edef68
2000-11-07 20:21:55 +00:00
David Reid
d6f677fe54 Remove some more references to sockaddr structures...
Removing the rest will need someone who knows this code to look through
in more detail.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86824 13f79535-47bb-0310-9956-ffa450edef68
2000-11-03 15:09:16 +00:00
William A. Rowe Jr
86f8525177 John's patches to provide depreciated messages for the -i and -u
options (now -k install|uninstall), and best yet, restart the console
  mode server on Ctrl+Break (Ctrl+C still stops it.)
  At least this is the second half - sorry I missed a bit.

Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86821 13f79535-47bb-0310-9956-ffa450edef68
2000-11-03 04:39:41 +00:00
William A. Rowe Jr
3698e24a5e John's patches to provide depreciated messages for the -i and -u
options (now -k install|uninstall), and best yet, restart the console
  mode server on Ctrl+Break (Ctrl+C still stops it.)

Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86820 13f79535-47bb-0310-9956-ffa450edef68
2000-11-03 04:34:42 +00:00
David Reid
60acdb0d07 We don't really want to fool around with socket structures if we don't have to,
and in this case we can get the ip address directly from the socket.  This
should mean that if we add more protocol support we don't have to worry about
this.  No doubt this is the first of many such changes...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86817 13f79535-47bb-0310-9956-ffa450edef68
2000-11-03 02:17:56 +00:00
David Reid
e878631436 We have functions that allow us to get the ports from the sockets, so use them
here.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86816 13f79535-47bb-0310-9956-ffa450edef68
2000-11-03 02:15:50 +00:00
William A. Rowe Jr
bdf3f917c0 Solve the os_is_absolute_path problem for the moment.
This is -not- the permanent patch for 2.0, simply a placeholder till we
  have the canonical name implemented in APR for good.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86804 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 20:05:00 +00:00
Ryan Bloom
d95eb05d77 Create a feature macro that determines if Autoconf was used to configure
the server.  The ap_ugly_hack variable is only valid if Autoconf was used
for the configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86802 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 18:51:08 +00:00
William A. Rowe Jr
37a90cb777 Get Win32 building again.
Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86797 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 04:46:42 +00:00
William A. Rowe Jr
f95da0f525 Get win32 building again... we need something just a little more sophisticated here
Submitted by:	John Sterling <sterling@covalent.net
Reviewed by:	rbb, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86796 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 04:44:43 +00:00
William A. Rowe Jr
3e93cdc58d Cause the command line version of mpm_winnt to do nothing with the
service config unless the -k run argument is provided.

Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86795 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 03:54:23 +00:00
Greg Stein
a55dfa4e75 Simplify the configuration mechanisms for threading in APR.
Revise how Apache configs APR and allow MPMs (or other config scripts) to
    pass cmd line params down to APR. For the MPMs that specifically require
    or disallow threads, have them force APR threads on/off.

Submitted by: Joe Orton <joe@light.plus.com>
Reviewed by: Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86794 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 03:30:36 +00:00
Jeff Trawick
2730adb574 Fix a buglet in the APR-ization of ap_lingering_close() -- use APR_SO_TIMEOUT
instead of BO_TIMEOUT.  (We were actually setting a different socket option.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86785 13f79535-47bb-0310-9956-ffa450edef68
2000-11-01 15:42:50 +00:00
Jeff Trawick
6c14dd3c74 exports.c is generated.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86776 13f79535-47bb-0310-9956-ffa450edef68
2000-10-31 12:34:10 +00:00
Ryan Bloom
511d2c481c This is an ugly little hack to allow DSO modules to work. This basically
forces Apache to link in all of the APR functions whether they are used
by any static modules or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86770 13f79535-47bb-0310-9956-ffa450edef68
2000-10-30 23:08:27 +00:00
Ryan Bloom
7d9a83ff92 Make mod_auth_db compile cleanly in 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86768 13f79535-47bb-0310-9956-ffa450edef68
2000-10-30 20:13:04 +00:00
Jeff Trawick
6217bc8f88 Introduce ap_xlate_proto_{to|from}_ascii() to clean up some of
the EBCDIC support.  They are noops on ASCII machines, so this
type of translation doesn't have to be surrounded by #ifdef
CHARSET_EBCDIC.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86751 13f79535-47bb-0310-9956-ffa450edef68
2000-10-26 10:48:28 +00:00
Jeff Trawick
66f97567e9 Get rid of the xlate version of ap_md5_digest()
since we don't compute digests of filtered (e.g., translated)
response bodies this way anymore.  (Note that we don't do it at
all at the present; somebody needs to write a filter to do so.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86750 13f79535-47bb-0310-9956-ffa450edef68
2000-10-25 18:54:20 +00:00
Ryan Bloom
20a7482f93 Add a comment about a requirement with the eos_sent variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86742 13f79535-47bb-0310-9956-ffa450edef68
2000-10-25 10:47:51 +00:00
William A. Rowe Jr
4486e14bb0 Answer says... -X is redundant and inappropriate.
Submitted by:	Bill Rowe
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86721 13f79535-47bb-0310-9956-ffa450edef68
2000-10-23 19:04:23 +00:00
William A. Rowe Jr
6abb1eaf13 A more thorough example is appropriate. Also simplify the behavior and
always return root (/) if n < 1, which is no worse than returning elems
  if n > elems.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86717 13f79535-47bb-0310-9956-ffa450edef68
2000-10-23 16:58:21 +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
Manoj Kasichainula
603dec1da3 Add a temporary pool argument to unixd_pre_config, so that it can call
APR functions (grumble). This is needed for apr_stat, which will be in
the suexec path coming up.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86710 13f79535-47bb-0310-9956-ffa450edef68
2000-10-23 10:54:18 +00:00
Ryan Bloom
a90cfa54f1 Make lingering close access the socket directly, instead of relying on
BUFF.  This has been tested, but all we can determine is that it doesn't
fail, not that it works.  This needs to be tested much better.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86709 13f79535-47bb-0310-9956-ffa450edef68
2000-10-23 10:46:20 +00:00
Bill Stoddard
458ab19e56 Fix some brain dead code.
Submitted by: Greg Stein
Reviewed by:  Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86706 13f79535-47bb-0310-9956-ffa450edef68
2000-10-22 15:53:27 +00:00
Bill Stoddard
d915406c82 Correct a check to see if we are attempting to remove a filter that has
already been removed from the stack. Hummm, seems to me we should not
attempt to remove filters multiple times....


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86705 13f79535-47bb-0310-9956-ffa450edef68
2000-10-22 15:48:34 +00:00
Jeff Trawick
902d55fc14 Get rid of a couple of buff-isms -- setting the B_EOUT flag in a couple
of places and doing ap_bread() in ap_lingering_close.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86700 13f79535-47bb-0310-9956-ffa450edef68
2000-10-22 13:20:36 +00:00
Ryan Bloom
1c795234e1 Add a way to remove output filters. This is used by http_header_filter to
remove itself once it has actually sent the headers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86690 13f79535-47bb-0310-9956-ffa450edef68
2000-10-21 17:22:28 +00:00