1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Commit Graph

211 Commits

Author SHA1 Message Date
Cliff Woolley
f8b29fb281 I don't know if this is the Right Way, but it certainly does make things
work better right now.  httpd-test is much much happier with this patch
(ie, we can serve pages again :)  I'm still seeing issues with mod_include,
but that's probably a different problem... will investigate.

Submitted by:	Doug MacEachern


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90603 13f79535-47bb-0310-9956-ffa450edef68
2001-08-24 01:26:31 +00:00
William A. Rowe Jr
4f3d0d2dfe I'm still not 100% certain on this test. Regardless, it doesn't impact
Unix, and this was the bug that Jeff's (none the less correct) fix masked.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90601 13f79535-47bb-0310-9956-ffa450edef68
2001-08-24 00:59:08 +00:00
William A. Rowe Jr
3ba6289b68 Eliminated ap_os_[systemcase|[case_]canonical]_filename() and
move ap_os_is_path_absolute() into util.c (now relies on apr.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90567 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 19:08:20 +00:00
William A. Rowe Jr
c327284b2f It doesn't get any simpler than this
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90547 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 13:08:48 +00:00
William A. Rowe Jr
ea2a3f582e The original answer was evil, return NULL if the file name has no path!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89666 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 19:52:41 +00:00
William A. Rowe Jr
c96cc340bb Reconsidered the wisdom of this change... back to the drawing board.
The ap_ prefix is still good, IMHO


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88313 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 01:12:50 +00:00
William A. Rowe Jr
5cccb4a478 Clean up namespace badness with s/configfile_t/ap_configfile_t/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88312 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 00:51:32 +00:00
Greg Stein
ee3fe477e3 *) fix inline handling. we had: apr_inline, APR_INLINE, USE_GNU_INLINE, and
INLINE. Now, we just have APR_INLINE and APR_HAS_INLINE.
   - convert all usage
   - note that apr_general messed up the defn (compared to apr.h)
   - simplify the inline decision logic in os/*/os.h
   - simplify the code in os/*/os-inline.c

*) toss ap_checkconv() [no longer used]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88298 13f79535-47bb-0310-9956-ffa450edef68
2001-02-24 11:23:31 +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
Greg Stein
de083a7ba1 write these in terms of strchr and strrchr so the compiler can possibly use
builtin, optimized functions.
[ they're stupid functions, but what the hell ]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88101 13f79535-47bb-0310-9956-ffa450edef68
2001-02-12 02:39:24 +00:00
Ryan Bloom
f9a1287c61 Fix a potential segfault on all platforms. David Reid fixed this for
BEOS, but this could actually happen on any platform, so we should
be safe and protect ourselves.
Submitted by:	Cliff Woolley <cliffwoolley@yahoo.com>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88080 13f79535-47bb-0310-9956-ffa450edef68
2001-02-11 00:51:38 +00:00
Greg Stein
bb282b75f7 Clean up some of the includes:
- explicitly include apr_lib.h since ap_config.h doesn't
- use apr_want.h where possible
- use APR_HAVE_ where possible
- remove some unneeded includes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88060 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 13:05:29 +00:00
David Reid
3abf3b4384 Fix more breakage on BeOS...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88044 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 01:16:11 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
Tony Finch
34274563f1 Get the correct IP address if ServerName isn't set and we can't
find a fully-qualified domain name at startup.
PR:             7170
Submitted by:   Danek Duvall <dduvall@eng.sun.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87938 13f79535-47bb-0310-9956-ffa450edef68
2001-02-01 09:59:25 +00:00
William A. Rowe Jr
7f4a5fe7f5 Use the appropriate APR_FINFO_flags for the apr_stat/lstat/getfileinfo
calls to avoid ownership and permissions on Win32 when they are not
  required, and until they are implemented.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87873 13f79535-47bb-0310-9956-ffa450edef68
2001-01-27 21:28:28 +00:00
David Reid
fce4fb7fb3 BeOS BONE shouldn't be using this BeOS R5 check, so alter the check to make it
work correctly.  Shouldn't this be APR'ized?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87872 13f79535-47bb-0310-9956-ffa450edef68
2001-01-27 20:03:23 +00:00
William A. Rowe Jr
cd1ef027c2 The changes required for the APR_FINFO_wanted argument to
apr_stat/lstat/getfileinfo.  These are -NOT- optimal, they
  are simply the required changes to get the server working.
  The size of the patch is a warning about how we need to
  really look at what we are trying to accomplish with all
  of these stat/lstat calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87760 13f79535-47bb-0310-9956-ffa450edef68
2001-01-20 21:42:23 +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
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
Bill Stoddard
501a0061f2 Fix a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87673 13f79535-47bb-0310-9956-ffa450edef68
2001-01-12 15:48:26 +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
David Reid
d5a0dc99af As we now use pools in the logging of the failure to get a hostname,
use ap_log_perror() as per Brians suggestion.

Submitted by:	Brian Havard <brianh@kheldar.apana.org.au>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87590 13f79535-47bb-0310-9956-ffa450edef68
2001-01-05 14:32:31 +00:00
David Reid
76090d0bed This stops a segfault on my machine where I haven't got a hostname for
the function to find.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87586 13f79535-47bb-0310-9956-ffa450edef68
2001-01-04 21:53:27 +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
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
fe2ef8d81b Fix two spelling and syntax problems in ap_get_local_host().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87211 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 16:18:54 +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
David Reid
425f55776c Change references of AF_ to reflect APR_ so they should work
on all systems.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87012 13f79535-47bb-0310-9956-ffa450edef68
2000-11-18 16:04:06 +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
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