1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

69 Commits

Author SHA1 Message Date
Jeff Trawick
0d2cef82b3 stop exporting APACHE_MPM_DIR to modules -- unclear why this was ever necessary, and it
makes no sense with loadable MPMs
axe the unnecessary MPM_DIR build variable
move the stray APACHE_SUBST(MPM_LIB) from configure.in to server/mpm/config.m4, where
  the other MPM_foos are handled


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@760403 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 11:34:49 +00:00
Jeff Trawick
a1908585a8 Core can specify a platform-specific rewrite args hook. Use that on Unix.
Windows continues to specify this in the MPM, at least until someone
can separate out the MPM-specific bits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759699 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:41:02 +00:00
William A. Rowe Jr
ecfa2af2b7 Axe a completely bogus internal helper function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@573105 13f79535-47bb-0310-9956-ffa450edef68
2007-09-05 23:22:26 +00:00
Paul Querna
cb2e304ba8 On mingw32, the APACHE_MPM_DIR is defined from the autoconf generated files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422191 13f79535-47bb-0310-9956-ffa450edef68
2006-07-15 09:25:28 +00:00
Roy T. Fielding
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
Ian Holsman
8c1e315d3f Doxygen fixup / cleanup
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 23:03:59 +00:00
William A. Rowe Jr
4167fdc172 80 col style fix, no code harmed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154329 13f79535-47bb-0310-9956-ffa450edef68
2005-02-18 17:34:05 +00:00
Bill Stoddard
d8cb4ecb8f fix compile break with recent rename of real_exit_code to ap_real_exit_code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154320 13f79535-47bb-0310-9956-ffa450edef68
2005-02-18 16:33:04 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
André Malo
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
André Malo
e0d2db5107 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102579 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 13:13:10 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
William A. Rowe Jr
e3f5de91bc A comment which no longer applies (proper AP_DECLARE_DATA voided the
disclaimer.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97460 13f79535-47bb-0310-9956-ffa450edef68
2002-11-08 16:29:19 +00:00
William A. Rowe Jr
d387982c7a Restrict Win32 API replacements from interfering with 3rd-party builders
of add-ons or any other consumer of win32's os.h.  PR 12779.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96875 13f79535-47bb-0310-9956-ffa450edef68
2002-09-18 16:42:02 +00:00
William A. Rowe Jr
d1bf15268a Refactor out the child behavior from mpm_winnt. This is the first
step in making a legible multiprocess windows mpm, or at least
  structuring the code to always begin a new child as an old one is
  going to die soon, rather than waiting for it's final dying breath.

  The only code that had to be affected [due to the split and general
  structure of the code] was merging the set_listeners_noninherited()
  code directly into the get_listeners_from_parent code, and also into
  the apr socket.c code for winnt.  For the most part the code splits
  rather nicely.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96221 13f79535-47bb-0310-9956-ffa450edef68
2002-07-29 05:06:20 +00:00
William A. Rowe Jr
48805e658d Add ap_os_proc_filepath and clean up the win32/os.h file structure.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95927 13f79535-47bb-0310-9956-ffa450edef68
2002-07-01 17:48:47 +00:00
William A. Rowe Jr
3f18121201 Finish the -w keep-console-open-on-error patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95869 13f79535-47bb-0310-9956-ffa450edef68
2002-06-23 10:24:07 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
William A. Rowe Jr
0801743658 This flag is no more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90608 13f79535-47bb-0310-9956-ffa450edef68
2001-08-24 03:02:57 +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
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
William A. Rowe Jr
390609a177 En route to httpd-2.0/modules/... in their appropriate places.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87202 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 06:57:20 +00:00
William A. Rowe Jr
c0aa89548f clean up some really bad typedefs - and move one into mpm_winnt.c since
that's the only module remaining that needs it.  Should be an apr type,
  but we aren't using the apr accessors to handle them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87115 13f79535-47bb-0310-9956-ffa450edef68
2000-11-29 01:50:02 +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
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
64c0937543 Eliminating a bunch-o-junk from the Win32 os.h header that now lives
in apr or isn't used.  Please review closely (every symbol removed was
  grep't for, and no references were found.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86598 13f79535-47bb-0310-9956-ffa450edef68
2000-10-15 19:38:50 +00:00
William A. Rowe Jr
c792f50d0a Move more path parsing fixes forward from 1.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86564 13f79535-47bb-0310-9956-ffa450edef68
2000-10-12 14:22:30 +00:00
William A. Rowe Jr
1abfaec810 New symbol for HAVE_URL_PATHS reminds me we need to prefix a bunch more
symbols with AP_.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86526 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 04:24:41 +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
Allan K. Edwards
4284045bed Get Win32 building after yesterday's patch to make MPM's explain
where to change compiled-in limits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85660 13f79535-47bb-0310-9956-ffa450edef68
2000-06-22 19:17:20 +00:00
William A. Rowe Jr
8981debf98 Time for these to be gone? I'd say it's long past :)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85603 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 21:06:24 +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
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
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
Ryan Bloom
9b90f11c5f Cleanup APR header files a bit. Basically, this splits ap_table_t related
functions into their own header file, away from apr_pools.h.  At the same
time as I was doing this, I removed a couple of definitions that aren't
used anywhere anymore, like ap_child_info_t.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85473 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 19:29:40 +00:00
Ryan Bloom
cc8eeb2d84 Remove all occurances of gettimeofday. Replace it with ap_now which
provides the same function but works cross-paltform.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85463 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 00:28:35 +00:00
William A. Rowe Jr
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
William A. Rowe Jr
e66f7255c4 PR:
Obtained from:
Submitted by:
Reviewed by:

  Just cleaning up API_EXPORT...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85306 13f79535-47bb-0310-9956-ffa450edef68
2000-05-26 18:58:43 +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
William A. Rowe Jr
44f9229e2e PR:
Obtained from:
Submitted by:
Reviewed by:

    Just a plain old screwup.  If someone can give me syntax to backout
    a change rather than reverse it, I'd be much obliged


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85236 13f79535-47bb-0310-9956-ffa450edef68
2000-05-17 00:45:05 +00:00
William A. Rowe Jr
9bfb956e51 Radical overhaul of the Apache-2.0/Win32 mpm <-> service schema.
1) Services and Registry are not part of the core Apache operations,
     so registry.c and service.c are moved into Apache.exe - assuring
     the service control layers of NT and 95 are truly isolated.

  2) Isolation can't be complete, we need to know when the mpm is
     fully initialized.  A new pointer to a no-arg function returning
     void is provided for this purpose, ap_mpm_init_complete.  It is
     only called if overridden with a non-NULL value prior to invoking
     apache_main.

  3) Control+C, Control+Break are handled on both WinNT and Win9x.

  4) The window close, logoff and shutdown events are handled on WinNT.

  5) The beginnings of a Win95 service startup are provided, -k startservice
     but this is horribly incomplete since Win95 will NOT report shutdown.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85235 13f79535-47bb-0310-9956-ffa450edef68
2000-05-17 00:35:21 +00:00
William A. Rowe Jr
adc0efc8c6 pcre lives and dies on the _WIN32 define, rather than WIN32...
Adjusted os/win32/os.h to always declare _WIN32, and fixed up
  some goodies.  Win32 now serves pages.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85163 13f79535-47bb-0310-9956-ffa450edef68
2000-05-06 16:09:10 +00:00
William A. Rowe Jr
6d9adaf3a8 Significantly shorten the Win32 build and shrink symbol tables
for precompiled headers and debugging by eliminating large chunks
  of the windows.h declarations, especially the graphical user
  interface declarations.

  Also eliminates redundant inclusion of winsock and windows headers.
  As the GUI sections can be included by adding the windows.h include
  prior to any apr headers, these includes now imply something
  completely different.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85117 13f79535-47bb-0310-9956-ffa450edef68
2000-05-01 14:40:03 +00:00
William A. Rowe Jr
150b558088 Replace ERROR constant with TODO_ERROR to flag these for review.
ERROR is a Windows.h constant of 0, or success, and is unrelated
  to the error codes!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85071 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 05:50:17 +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
Bill Stoddard
2e7ac8ac5f Get APR DSO code working under Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84898 13f79535-47bb-0310-9956-ffa450edef68
2000-04-03 20:41:14 +00:00