1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-26 05:42:34 +03:00
Commit Graph

80 Commits

Author SHA1 Message Date
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
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
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
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
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
dddb7a835d The final line of the config file was not being read if there was
no \n at the end of it.  This was caused by apr_fgets returning
APR_EOF even though we had read valid data.  This is solved by
making cfg_getline check the buff that was returned from apr_fgets.
If apr_fgets return APR_EOF, but there was data in the buf, then we
return the buf, otherwise we return NULL.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86643 13f79535-47bb-0310-9956-ffa450edef68
2000-10-18 15:58:29 +00:00
William A. Rowe Jr
d6490633eb Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols
for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper)
  and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE.
  All _VAR_ flavors changes to _DATA to be absolutely clear.
  Thank you Greg, for the most obvious suggestion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86609 13f79535-47bb-0310-9956-ffa450edef68
2000-10-16 06:05:15 +00:00
William A. Rowe Jr
a286d71463 Completes the port of the <Directory /> handling for Win32... there is
still a patch needed for OS2 ... Brian?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86579 13f79535-47bb-0310-9956-ffa450edef68
2000-10-13 16:57:21 +00:00
William A. Rowe Jr
4a5c3eef1f Modify ap_make_dirstr_prefix, platforms with HAVE_DRIVE_LETTERS or NETWARE
can request 0 elements, returning the '/' root.
  [William Rowe, Tim Costello]  from 1.3, with documentation


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86571 13f79535-47bb-0310-9956-ffa450edef68
2000-10-12 19:45:56 +00:00
Ryan Bloom
cce128b09e Remove some deprecated functions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86486 13f79535-47bb-0310-9956-ffa450edef68
2000-10-09 22:57:51 +00:00
Jim Jagielski
6ebf77b96c Port over the config directory stuff...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86409 13f79535-47bb-0310-9956-ffa450edef68
2000-10-05 22:35:08 +00:00
dgaudet
0ea4f1fff0 finish cleaning up after a change i made over 3 years ago.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86078 13f79535-47bb-0310-9956-ffa450edef68
2000-08-15 12:44:28 +00:00
Jeff Trawick
f7ec9ddb5b A few more (last?) ap_xlate->apr_xlate changes covering stuff not completely
handled in the big apr rename last week.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86020 13f79535-47bb-0310-9956-ffa450edef68
2000-08-07 20:11:37 +00:00
William A. Rowe Jr
1a9db204f5 Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...
see src/lib/apr/apr_compat.h for most details.
  Also a few minor nits to get Win32 to build.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86008 13f79535-47bb-0310-9956-ffa450edef68
2000-08-06 06:07:53 +00:00
Doug MacEachern
059d8dd212 prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 05:27:38 +00:00
William A. Rowe Jr
847b20108c Add APR_EOL_STR for a platform specific text delimiter, provided by
apr.h (defined in apr.h.in and apr.hw).  This is needed -only- in APR
  created files (true raw files) such as logs.  It is not required in any
  splat to screen (stderr/stdout) formatting, nor any html markup.

  Some other modules slipped through in the prior apr_strings.h commit.
  Sorry 'bout that.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85878 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 01:06:32 +00:00
Ryan Bloom
22d9fbdec0 Move all APR functions related to strings to their own directory, and
create a new header for those functions.  This is the first step to
removing the apr/lib directory completely, and moving those files/functions
to descriptive directories.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85867 13f79535-47bb-0310-9956-ffa450edef68
2000-07-21 19:50:58 +00:00
Jeff Trawick
db3c12a79e Fix some bad ap_log_error() invocations. Comment on a bad
ap_log_rerror() invocation.

Almost all of this is in code never compiled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85860 13f79535-47bb-0310-9956-ffa450edef68
2000-07-17 22:11:47 +00:00
Jeff Trawick
8ad5bec4cb Grab OtherBill's latest 1.3 code to provide a default ServerName
and log the error.
Submitted by:	"William A. Rowe, Jr." <wrowe@lnd.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85859 13f79535-47bb-0310-9956-ffa450edef68
2000-07-17 21:20:43 +00:00
Jeff Trawick
b5c0ae056b Include strings.h for strcasecmp(), strncasecmp(), and bzero().
Include time.h for time().

This removes a bunch of compiler warnings with gcc -Wall on AIX.
Submitted by:	Jeff Trawick, Victor Orlikowski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85723 13f79535-47bb-0310-9956-ffa450edef68
2000-06-28 14:33:48 +00:00
Greg Stein
02a2200fd8 blast the old names for the status codes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85686 13f79535-47bb-0310-9956-ffa450edef68
2000-06-24 17:34:11 +00:00
William A. Rowe Jr
6c265eb9e6 Correct the problem where the only local host name that the IP stack
can discover are 'undotted' private names.  If no fully qualified
    domain name can be identified, the default ServerName will be set to
    the machine's IP address string.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85636 13f79535-47bb-0310-9956-ffa450edef68
2000-06-20 19:30:32 +00:00
Ben Laurie
c0a4cb7873 More consification, correct command initialisation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85599 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 16:29:53 +00:00
Ben Laurie
7a22b1a75a Constification.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85598 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 12:36:54 +00:00
Ben Laurie
c1b39458ab Command handler revamp. Note that this makes the code produce a LOT of
warnings!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85595 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 11:13:05 +00:00
Jeff Trawick
b18a907dad Turn on buffering for config file reads. This is dependent on ap_fgets()
doing the right thing.

Brian Havard implemented buffering for ap_fgets() on Win32 recently; OS/2 had
it already.  This provides it for Unix.

changes to ap_read(), ap_getc(), ap_fgets() for Unix:

1) this fixes a problem in where ap_open() where a lock is created for
   non-buffered files
2) this fixes problems setting rv correctly in the ap_read() buffered
   path
3) since ap_read() works as expected, it is possible to make ap_getc()
   and ap_fgets() even smaller
4) ap_fgets() no longer cares about '\r'


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85586 13f79535-47bb-0310-9956-ffa450edef68
2000-06-16 16:41:21 +00:00
Jeff Trawick
a9746375cf Get the ap_config.h cleanup working on FreeBSD by adding includes of
additional system headers.

A platform check in logresolve.c to determine whether or not we include
<arpa/inet.h> was converted to a feature check.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85567 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 21:36:18 +00:00
Ryan Bloom
750d8cc03c Protect system header files with the appropriate macros.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85558 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 23:03:05 +00:00
Ryan Bloom
580852da85 Clean up a big chunk of ap_config.h. This basically stops ap_config.h from
including any files.  Because of this change, other files must include
their own headers.  I also cleaned up a couple of other bugs in some
modules because I had to compile them all.

I expect this to break multiple platforms, but this will be fixed over time.
The massive configure cleanup is almost done.  I will go through the files
one more time after this commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85553 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 21:47:17 +00:00
Ryan Bloom
16748b4e22 Remove the final vestiges of stat.h from Apache 2.0. All calls are now to
ap_stat.  This also adds the new function ap_lstat().  This function is
analogous to lstat.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85535 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 15:29:09 +00:00
Ryan Bloom
4e7616169e Remove waitpid from the config checks and all calls to waitpid from the
server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85488 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 22:05:36 +00:00
Ryan Bloom
6b6800fd85 Remove a bunch of string functions from Apache. These are basically
standard string functions like strstr, strcasecmp, etc that Apache used
to define for platforms that don't have them.  These functions and the
feature tests have moved down to APR where they really belong.  In doing
this, I am also able to remove a bunch of tests from the Apache configure
process.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85487 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 21:19:52 +00:00
Ryan Bloom
9803fc27fd Remove all occurances of strerror from Apache. ap_strerror works just
fine with standard errno values, and it is more portable.  This also allows
me to remove the check for strerror from Apache's configure script.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85486 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 18:57:16 +00:00
Manoj Kasichainula
aec887ec5e Remove all remaining instances in Apache code of
ap_{block,unblock}_alarms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85265 13f79535-47bb-0310-9956-ffa450edef68
2000-05-21 05:31:09 +00:00
Jeff Trawick
1b03656219 The following is a patch to fix Dirk's patch from March 14 so that
mod_rewrite will work without caveats. Basically Dirk was just
dropping patterns of the form ${x} if x didn't resolve to an
environment variable. That breaks mod_rewrite since mod_rewrite
uses the same syntax for some of its non-environment directives.

The patch below simply puts the behavior for unresolved values back
to what it was before Dirk's patch. If it is unresolved, it is just
left in the directive as is. Further processing will handle the value.

Dirk's optimization still holds if x is resolved. A small price is paid
if x is not resolved, but that shouldn't happen often.

(Note: some tweaks to the comments were negotiated offline after Paul
posted the patch to new-httpd.)
Submitted by:	Paul Reder <rederpj@raleigh.ibm.com>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85245 13f79535-47bb-0310-9956-ffa450edef68
2000-05-18 14:11:23 +00:00
William A. Rowe Jr
710c1945d1 Cleanup ap_config.h fallout for Win32. Only a few very minor
changes to ap_config.h and util.c, but they might hurt someone...
  please watch those two carefully.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85237 13f79535-47bb-0310-9956-ffa450edef68
2000-05-17 01:52:48 +00:00
Jeff Trawick
3d35a19121 APR-ize some EBCDIC logic which handles conversion between
characters and hex digits


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85221 13f79535-47bb-0310-9956-ffa450edef68
2000-05-16 01:43:46 +00:00
Jeff Trawick
34ecfec8d0 Pick up various EBCDIC fixes from 1.3 (from Martin Kraemer and Oliver
Reh originally according to the change log).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85176 13f79535-47bb-0310-9956-ffa450edef68
2000-05-10 19:07:43 +00:00
Ryan Bloom
c445556372 Replace hsregex with PCRE. The PCRE library is always used in 2.0,
regardless of what system we are on.  Currently, we are using the POSIX
wrappers that PCRE provides.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85153 13f79535-47bb-0310-9956-ffa450edef68
2000-05-05 23:17:54 +00:00
William A. Rowe Jr
85845c9bcb PR:
Obtained from:
Submitted by:	William Rowe
Reviewed by:

  Created ap_base64.h to extract those declarations for clarity from ap.h

  CORE_PRIVATE, httpd.h do not belong in library functions, removed from ap.lib

  Use apr headers for declarations in ap.lib stuff, kill AP_LONG from ap_sha1.h

  Move credit to lib/apr/lib/ap_snprintf.c from ap.h for authorship


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85097 13f79535-47bb-0310-9956-ffa450edef68
2000-04-29 16:00:33 +00:00
Greg Stein
c2c13c67c3 clean up cmd_parms: config_file is no longer valid; end_token is bogus;
add directive.
move configfile_t and functions from httpd.h to http_config.h
new signature for ap_build_config() (since config_file removed from cmd_parms)
add "data" to ap_directive_t for future use by modules. add filename.
syntax checking for section-close directives: a section-open must exist,
    the section-close must be </FOO>, and the open/close must match.
    the file as a whole must be properly balanced (issue errors for each
    unmatched section-open).
</FOO> command_rec structures are obsolete. Remove from http_core.c.
do not store </FOO> directives in the config tree.
clean out section-close logic from http_core.c (and old, related comments)
<Limit> and <LimitExcept> must walk their children.
new mechanism in ap_check_cmd_context() for testing enclosure in a
    Directory/Location/File: find_parent()
<IfModule> and <IfDefine> must pass cmd->context when walking the children
several places: we had a walk followed by ap_get_module_config(). that
    assumed the walk would create a config that we could fetch, which is not
    true -- it is possible that the children are all from other modules
    (e.g. the <Files> section in httpd.conf-dist has no "core" directives).
    using ap_set_config_vectors() ensures we get a structure, and it returns
    it to us.
    [ note: when we had </Directory> (and friends) in the tree, the config
      would get created; removing the directive removed the config; this
      was a bitch to track down :-) ]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85024 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 12:00:43 +00:00
Brian Havard
5c2410d6e2 Change strncasecmp() definition to match Bill's prototype. Fixes compile
break on OS/2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85022 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 06:51:22 +00:00
Ryan Bloom
de3a77dc01 Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84963 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 15:59:20 +00:00
Ryan Bloom
db9d037c36 Make the server work without asking for buffered file I/O. This removes
all APR_BUFFERED flags from the server, and it fixes a minor bug in the
ungetchar patch (I forgot a file when comitting).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84933 13f79535-47bb-0310-9956-ffa450edef68
2000-04-06 23:53:59 +00:00
Roy T. Fielding
057b29f829 Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84878 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 08:44:21 +00:00
Dirk-Willem van Gulik
99a9d6e3e0 Another one in the department of fairly useless patches which
are best described as feature creep. Allows ${ENV} constructs
in the config file. This avoids the need for mod_perl or
m4 cleverness whilst mainting some of the usefullness. It
does not do (of course) multiline things or anything that clever.

Feel free to flame me.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84765 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 14:09:52 +00:00
Jim Jagielski
70ef1e69d5 Backport the CSS security fixes to Apache 2.0a. Or is that forward
port? My sense of direction is all confused.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84751 13f79535-47bb-0310-9956-ffa450edef68
2000-03-13 20:27:29 +00:00
Ryan Bloom
b1c26f031a Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
2000-03-10 00:07:37 +00:00
dgaudet
7dd8a75266 clean up a bunch of -Wall/etc warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84698 13f79535-47bb-0310-9956-ffa450edef68
2000-03-02 11:05:17 +00:00