Commit Graph

50 Commits

Author SHA1 Message Date
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
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
3815aef2ee This solves two issues, one is a backref from apr-util into the
apache namespace, and the second is the proper linkage declarations
  and their explanations.  Documented the distinction between
  AP_IMPLEMENT_HOOK_ and AP_IMPLEMENT_EXPORT_HOOK_

  This doesn't resolve any export issues within apr-util, however.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87229 13f79535-47bb-0310-9956-ffa450edef68
2000-12-06 05:59:50 +00:00
140586d14f Namespace protect the rest of the macros defined by ap_config.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86661 13f79535-47bb-0310-9956-ffa450edef68
2000-10-19 00:05:00 +00:00
74ff3bb990 Make things a little clearer in reaction to the _snames snafus.
Submitted by:	Greg Stein
Reviewed by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86626 13f79535-47bb-0310-9956-ffa450edef68
2000-10-17 13:26:55 +00:00
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
f43a574bcd I hope this clarifies. Greg is absolutely correct, there is no need for
any modules symbol other than AP_MODULE_DECLARE_DATA, since module .h
  files containing imports and exports imply something more sophisticated,
  as the early mod_dav.c example illustrated.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86562 13f79535-47bb-0310-9956-ffa450edef68
2000-10-12 06:14:30 +00:00
3f7906e840 Parallels the commit to apr.h.in/apr.hw for the apache core library.
Only mod_dav/mod_dav_fs and ap_hooks.h (as best examples) will use these
  symbols until it is acceptable to all or the new symbols are backed out.

  This symbol rename will have the unique quality that
  strlen("API_EXPORT") == strlen("AP_DECLARE"), therefore the mass symbol
  rename will not throw off function continuation lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86539 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 17:08:39 +00:00
39d454d091 This much, at least, we don't need to debate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86532 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 07:52:09 +00:00
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
28f6bfe4a2 Remove all of the ap_is* functions from Apache. They were already in APR,
and we all hate duplicate code.  :-)  This also required adding ap_isascii
to APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85897 13f79535-47bb-0310-9956-ffa450edef68
2000-07-26 15:31:30 +00:00
6704c8e677 Move the checks for bcopy and memmove down to APR. APR now defines memmove
and bzero on platforms that do not natively support them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85706 13f79535-47bb-0310-9956-ffa450edef68
2000-06-27 21:35:27 +00:00
6878409552 Remove select checks from Apache config. These checks were used to define
ap_select in ap_config.h.  The only file that used ap_select() was
prefork.c.  I have modified prefork.c to use select instead of ap_select.
In the future, this should be modified to use ap_poll like the rest of the
Unix MPMs.  There are other MPMs that are continuing to use select, but this
too should change in time.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85663 13f79535-47bb-0310-9956-ffa450edef68
2000-06-22 22:49:50 +00:00
0219062e84 Repair C++ compatibility in ap_config.h, apr_file_io.h,
apr_network_io.h, and apr_thread_proc.h.
Submitted by:	Tyler J. Brooks <tylerjbrooks@home.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85613 13f79535-47bb-0310-9956-ffa450edef68
2000-06-19 00:45:39 +00:00
4c847f5ff6 Remove the check for EAGAIN. With APR handling the error codes, this is
no longer an issue that Apache needs to deal with.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85559 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 23:34:23 +00:00
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
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
8a9a5b90ac Cleanup more of the Apache configuration. This removes all of the shared
memory checks, because Apache relies completely on APR for shared memory
support.  In doing this, we also need to know how APR/MM are providing
our shared memory (ie file or memory) that requires the change made to
APR's configure script that was just committed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85501 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 16:15:08 +00:00
88b6c4ac2b Get FreeBSD building again with the resource limiting changes (FreeBSD
3.4, at least).

rlim_t is defined in <sys/types.h>, so we usually need that.

Some stuff in <sys/resource.h> needs <sys/time.h> for timeval just to
be able to compile :(


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85500 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 12:02:29 +00:00
568362d70c Fix the check for rlim_t correctly. I wish I had known that we had
created an rlim_t check in acinclude.m4.  :-)
Submitted by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85476 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 21:32:13 +00:00
29a2154b85 ARGH! resource.h lives in sys.
Submitted by:	Doug M.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85475 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 20:30:58 +00:00
e629f47a13 Include a definition of rlim_t if the platform doesn't have it natively.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85474 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 20:21:35 +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
2f0e895df0 Keep the MSVC++-isms out of the Unix flavor of API_EXPORT().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85314 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 14:22:13 +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
da18421916 Fix problem where the Unix mpms had an unitialized variable for
child exit status by adding an exit status parameter to
ap_wait_all_procs(); with this change, the mpms use
ap_wait_all_procs() more like they previously used waitpid().

With the introduction of the exit status parameter, the definition
of ap_wait_t was moved from Apache to APR.  There was some handling
of union wait for the type of the exit status parameter to waitpid()
which I retained (but cannot test).  For WIN32, ap_wait_t was defined
as int (in apr.hw).  No current Windows code uses ap_wait_t, but a
type is required so that references to ap_wait_t in apr_thread_proc.h
can compile on Windows.

Note: There is still a storage leak in the way that the Unix mpms call
ap_wait_all_procs()...  this will be resolved at some later time.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85243 13f79535-47bb-0310-9956-ffa450edef68
2000-05-18 02:17:30 +00:00
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
71cb49bb0a fix up the repository with the correct add/remove sequence.
this is the initial checkin of ap_config.h: it is a copy of ap_ac_config.h
    which has now been deleted. go there for proper history.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85234 13f79535-47bb-0310-9956-ffa450edef68
2000-05-17 00:22:56 +00:00
d5e5e9c026 All this file does is include another file. I am fixing this by removing
this file and replacing it with the file it includes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85210 13f79535-47bb-0310-9956-ffa450edef68
2000-05-12 23:48:01 +00:00
d8c829e6af First crack at getting Apache to build with pcre in Win32.
Cleans up all the gen_ projects to strip off garbage files,
  as well, and follows the same pattern for dftables.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85161 13f79535-47bb-0310-9956-ffa450edef68
2000-05-06 15:02:13 +00:00
98730c630f stop relying on a macro to map signal() to ap_signal(); call
ap_signal() directly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84916 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 02:09:44 +00:00
2a98ce1a7a Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84877 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 07:19:05 +00:00
797eb4b036 Bring forward my recent 1.3 patches.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84802 13f79535-47bb-0310-9956-ffa450edef68
2000-03-20 02:42:20 +00:00
66b5916e89 Test for AP_USE_HSREGEX, not USE_HSREGEX, as that's what actually gets
defined (in ap_config_auto.h) when using the bundled hsregex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84795 13f79535-47bb-0310-9956-ffa450edef68
2000-03-19 13:28:42 +00:00
ad3cb55128 Eliminate implicit usage of access.conf and srm.conf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84771 13f79535-47bb-0310-9956-ffa450edef68
2000-03-15 23:18:32 +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
191c4462f1 Submitted by: Sascha Schumann <sascha@schumann.cx>
Reviewed by:	Rasmus Lerdorf

    -   INADDR_NONE is not defined. Supply a replacement
    -   APACHE_MODULE() used a non-portable shell construct
    -   inet_addr() needs -lnsl -lsocket. Neccessary checks added
    -   For POSIX conformance, _POSIX_PTHREAD_SEMANTICS is
        required. This fixes i.e. sigwait() problems.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84367 13f79535-47bb-0310-9956-ffa450edef68
1999-12-24 18:40:27 +00:00
95c3a48df8 Disable the DYLD_CANT_UNLOAD workaround for Mac OS X Server, since the
current version (and the patched older version) doesn't need this any
more.  We don't want to delete the code from unix/os.c, however,
because OpenStep's dyld needs it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84220 13f79535-47bb-0310-9956-ffa450edef68
1999-12-04 02:56:18 +00:00
04c494c2b5 Eliminate ap_config.h's checks when using autoconf. Now, ap_ac_config.h
is used instead, and autoconf's configure script will check for
everything else.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84200 13f79535-47bb-0310-9956-ffa450edef68
1999-12-01 01:16:23 +00:00
3cfe8158af Deal with times() properly in autoconf. This also changes NO_TIMES to
!HAVE_TIMES.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84193 13f79535-47bb-0310-9956-ffa450edef68
1999-11-30 03:52:57 +00:00
a7a251cb29 The first part of the big autoconf patch. This replaces a bunch of
NEED_* macros with HAVE_* macros to be more consistent with autoconf.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84186 13f79535-47bb-0310-9956-ffa450edef68
1999-11-29 23:33:24 +00:00
e400447191 A bit of WIN32 header file cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83897 13f79535-47bb-0310-9956-ffa450edef68
1999-09-13 14:07:22 +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
127b62666a The closesocket define causes problems on BeOS. Get rid of it where
appropriate.

Submitted by:	In part by David Reid <abb37@dial.pipex.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83872 13f79535-47bb-0310-9956-ffa450edef68
1999-09-06 03:23:39 +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
cb7f073d26 A bunch of changes to get the server compiling on WIN32. mod_cgi, mod_include,
mod_isapi and mod_so don't work so I am not making them. Moved a lot of code out
of multithread.*  and into os.* (didn't want to add multithread to the new repository).
Much of this can be cleaned up when APR is stable.

And Dean's gonna but me for sure for the http_main hit. It's may be
possible to name a DLL entry point 'main()'. Just havent tried it yet.

Enjoy!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83822 13f79535-47bb-0310-9956-ffa450edef68
1999-08-27 22:57:27 +00:00
aa9f315839 Add prototype for ap_select on OS/2
Submitted by:	Brian Havard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83785 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:54:14 +00:00
174302fd22 More MPM changes. Remove NO_OTHER_CHILD defines.
Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83784 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:52:53 +00:00
e7fd96857e Special Support for User-Space Threading Environments
Submitted by:	Ralf S. Engelschall


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83783 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:49:14 +00:00
ef31f58424 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@83749 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 05:50:50 +00:00