Commit Graph

41 Commits

Author SHA1 Message Date
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
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
ce7a5bcaff Remove apr_strnatcmp.h. All of the functions prototyped in this file
have been moved to apr_strings.h.  This also modifes Apache to include
apr_strings.h instead of apr_strnatcmp.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85872 13f79535-47bb-0310-9956-ffa450edef68
2000-07-23 17:31:08 +00:00
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
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
8b17259223 Fix a couple of const warnings on Linux. This basically just defines
ap_strstr and ap_strstr_c, which make sure that things are const when
they need to be.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85687 13f79535-47bb-0310-9956-ffa450edef68
2000-06-24 19:31:42 +00:00
d287a7ea2e Fix warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85640 13f79535-47bb-0310-9956-ffa450edef68
2000-06-20 20:39:39 +00:00
d1185107ff Use the new command-handler initializer macros in some more modules.
Unfortunately, the resulting warnings are *not* all cleaned up.  Ten or
so warnings spill over to non-AP_DEBUG builds (but that just means that
there is a bigger pool of folks to resolve them, right?).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85627 13f79535-47bb-0310-9956-ffa450edef68
2000-06-20 11:31:54 +00:00
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
da493b8be1 PR:
Obtained from:
Submitted by:
Reviewed by:

  Reverse out all _EXPORT_VAR changes back to their original _VAR_EXPORT
  names for linkage (API_, CORE_, and MODULE_).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85318 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 22:40:44 +00:00
86e2a18f2a This patch corrects the issues from the AP_EXPORT and linkage
specification arguments to the ap_hooks.h declarations.  As with
  the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR,
  and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR.

  I will be happy to revert the inclusion of ap_config.h from 
  httpd.h if this bothers anyone.  More individual modules need
  to be patched if we do so.

  The API_EXPORTs all moved into central storage in the ap_config.h
  header.  Without WIN32 or API_STATIC compile time declarations, 
  these macros remain no-ops.

  This patch also moves the following data from http_main to http_config:

    const char *ap_server_argv0;
    const char *ap_server_root;
    ap_array_header_t *ap_server_pre_read_config;
    ap_array_header_t *ap_server_post_read_config;
    ap_array_header_t *ap_server_config_defines;

  And the following variables had already moved into ap_hooks.c:

    ap_pool_t *g_pHookPool;  (initialized now in http_config)
    int g_bDebugHooks;                   (out of http_config)
    const char *g_szCurrentHookName;     (out of http_config)

  The changes to http_main.c are in preparation for that module to
  move out to a seperate .exe for win32.  Other platforms will be
  unaffected, outside of these changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85309 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 05:28:02 +00:00
8bfd06c6f5 Change names of strnatcmp & strnatcasecmp to cpmply with APR naming
conventions

Submitted by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85028 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 14:57:54 +00:00
89d7e60303 Add `IndexOptions +VersionSort', to nicely sort filenames
containing version numbers.

Submitted by:	Martin Pool <mbp@linuxcare.com.au>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85021 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 04:03:39 +00:00
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
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
2bee4ad19d Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84879 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:05:25 +00:00
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
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
4c589013b9 Small changes to remove some compiler complaints.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84598 13f79535-47bb-0310-9956-ffa450edef68
2000-02-10 13:24:13 +00:00
505fa49a3a Manoj has been pushing for this for a while, but I've been too dense
to understand that he was right.  :-)  Basically, this makes the modules
use ap_config to test for header file inclusion.  This method is not to
be used for larger modules that run autoconf theirselves.  Including
ap_config is only valid for modules which rely on Apache to do their
configuration.  Currently, this is only the core modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84497 13f79535-47bb-0310-9956-ffa450edef68
2000-01-19 02:42:17 +00:00
70a4fae036 This is a huge change to the configure system. Basically, this name space
protects most, if not all, of the Apache macros.   This has been tested on
Linux using all of the Unix MPM's.  The biggest push was that Apache's
httpd.h header file can no longer include the ap_config.h file.  Most of the
other files include this themselves now.
Submitted by:	Ryan Bloom and Manoj Kasichainula


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84492 13f79535-47bb-0310-9956-ffa450edef68
2000-01-18 23:41:56 +00:00
0df3ec32ca Rework ap_finfo_t to split the file type out of the protection field.
I've taken a stab at the unix implementation but tested only on OS/2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84416 13f79535-47bb-0310-9956-ffa450edef68
2000-01-10 15:35:51 +00:00
faff1f01dd time overhaul:
- ap_time_t is a 64-bit scalar, microseconds since epoch
- ap_exploded_time_t corresponds to struct tm with a few extras

probably broken on anything except linux.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84413 13f79535-47bb-0310-9956-ffa450edef68
2000-01-09 05:18:31 +00:00
2dbb9e6e0a Move some modules over to using ap_time_t instead of struct tm.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84407 13f79535-47bb-0310-9956-ffa450edef68
2000-01-07 20:38:06 +00:00
4870d9eb75 Next pass at the time functions. This defines an ap_ansi_time_t which has
a specific format (seconds since 0:00:00 Jan 1, 1970).  I also renamed the
(get|set)_curtime functions to (get|set)ansitime.  This should make more
sense, and be a bit more intuitive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84400 13f79535-47bb-0310-9956-ffa450edef68
2000-01-06 19:19:39 +00:00
8f26ac7df4 Separate the stat structure from the file structure and use ap_stat and
ap_getfileinfo in apache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84397 13f79535-47bb-0310-9956-ffa450edef68
2000-01-06 14:43:41 +00:00
528afcc4d6 Initialize all ap_file_t's to NULL. This allows ap_open and ap_stat to
work together without causing memory leaks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84393 13f79535-47bb-0310-9956-ffa450edef68
2000-01-04 19:01:04 +00:00
e35f6d1f09 Update some dependancies. Move the final two files out of apr/inc and into
apr/include.  Basically just finish some cleanup from some changes I've
been making over the last two days.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84147 13f79535-47bb-0310-9956-ffa450edef68
1999-11-23 13:47:01 +00:00
7c3faefb29 mod_autoindex has a small bug when calling ap_readdir. This was
causing empty indexes to be created. The following patch fixes
this problem
Submitted by:	Paul Reder
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84111 13f79535-47bb-0310-9956-ffa450edef68
1999-11-09 03:41:11 +00:00
9030edb03b Size rigour.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84032 13f79535-47bb-0310-9956-ffa450edef68
1999-10-24 19:24:13 +00:00
482dcf3495 Add a status value to ap_log_error and ap_log_rerror. This allows us to use
apr_status codes in our error logs.  The main advantage of this, is portable
error codes.  Now, Windows will finally be able to use errno!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84007 13f79535-47bb-0310-9956-ffa450edef68
1999-10-20 12:50:12 +00:00
234823c5c5 I missed one function when swapping paramters. This fixes it. I think I
have caught them all this time.  I really hope this is the final time I have
to swap parameters.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83996 13f79535-47bb-0310-9956-ffa450edef68
1999-10-14 14:36:49 +00:00
8c18eee13a Remove most of the annoying "re ap_context_t mplement" mis-replacements
by what I think is their real meaning. Guys, I didn't verify all of this,
please have a close look at my "fixes". Thanks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83970 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 22:40:18 +00:00
e75cbac28c Bring file_io up to the new parameter order for APR. I have decided to do
these on a directory by directory basis for the rest of APR.  I hope to
cause fewer problems for other developers by doing it this way.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83937 13f79535-47bb-0310-9956-ffa450edef68
1999-10-06 23:04:16 +00:00
2b361ec557 First patch to re-order function parameters. This one gets the low hanging
fruit, and moves most of the result parameters to the first argument.
Future patches in this series will move the rest of the result parameters
to the beginning of the list, and will move the context's to the end of the
list


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83927 13f79535-47bb-0310-9956-ffa450edef68
1999-10-04 16:38:16 +00:00
e4e32bb59e A change to how APR uses user data. Now, user data is a linked list that
is retreivable using a char string.  Basically, you provide a string that
will be used as a key when you store the data.  If the key was used before,
we will overwrite the old data.  When you want to retreive your data, pass
in the same key, and we will find the data you care about.  This also makes
it harder to put user data in when creating a context, so that option has
disappeared.  It is also impossible to inherit user data from parent contexts.
This option may be added in later.  I will be documenting this VERY soon.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83901 13f79535-47bb-0310-9956-ffa450edef68
1999-09-14 13:37:45 +00:00
69adf379b4 Remove all of the calls to functions like "ap_popenf". These functions were
moved down to APR, but they are being removed.  They are not portable, and
were only moved down for backwards compatability.  With this change, they can
be safely removed, which is the next commit on it's way.
Submitted by:  Ryan Bloom and Paul Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83879 13f79535-47bb-0310-9956-ffa450edef68
1999-09-08 14:15:55 +00:00
c37f14ddf3 Changed pools to contexts. Tested with prefork and pthread mpm's. I'll
check this out tomorrow and make sure everything was checked in correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83852 13f79535-47bb-0310-9956-ffa450edef68
1999-08-31 05:35:52 +00:00
dc349534f3 Remove timeouts as part of pthreads changes.
Submitted by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83788 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 17:17:22 +00:00
9f817aa324 Start to implement module-defined hooks that are a) fast and b) typesafe.
Replace pre_connection module call with a register_hook call and
implement pre_connection as a hook. The intent is that these hooks will
be extended to allow Apache to be multi-protocol, and also to allow the
calling order to be specified on a per-hook/per-module basis.  [Ben Laurie]

Port a bunch of modules to the new module structure.
["Michael H. Voase" <mvoase@midcoast.com.au>]

Submitted by:   Ben Laurie


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83786 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 17:09:12 +00:00
e3e87d34a0 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83751 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 06:55:44 +00:00