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

84 Commits

Author SHA1 Message Date
Doug MacEachern
bc660e9860 top_module global variable renamed to ap_top_module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88582 13f79535-47bb-0310-9956-ffa450edef68
2001-03-26 15:39:52 +00:00
Ryan Bloom
d2d23882af Allow modules to query the MPM about it's execution profile. This
query API can and should be extended in the future, but for now,
max_daemons, and threading or forking is a very good start.

Non-Unix MPM's do have the MPM query function, although there is no
garauntee that the information is perfect, please check.

Submitted by:	Jon Travis <jtravis@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88437 13f79535-47bb-0310-9956-ffa450edef68
2001-03-02 22:46:33 +00:00
Jeff Trawick
47b18adf09 no need to calculate the config file name in display_info() since we
don't have to read it

PR:		6980


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88431 13f79535-47bb-0310-9956-ffa450edef68
2001-03-02 21:51:00 +00:00
Ryan Bloom
4f7dd462ea Fix mod_info, so that <Directory> and <Location> directives are
not displayed twice when displaying the current configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88416 13f79535-47bb-0310-9956-ffa450edef68
2001-03-02 05:50:05 +00:00
William A. Rowe Jr
16231360f1 Goodbye ap_send_http_header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88390 13f79535-47bb-0310-9956-ffa450edef68
2001-02-28 15:24:09 +00:00
William A. Rowe Jr
4f3f34e9d4 Whoops ... if I'm enabling mod_info to build on Win32, better clean
up the declarations of these private core symbols.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88333 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 20:57:51 +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
Ryan Bloom
9d85d10c10 Fix any compile breaks after moving apr_snprintf and apr_vsnprintf to
apr_strings.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88077 13f79535-47bb-0310-9956-ffa450edef68
2001-02-11 00:12:43 +00:00
Jeff Trawick
8f548be18d get rid of some warnings and an undefined reference which crept into
some modules overnight


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88063 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 15:01:16 +00:00
Greg Stein
23714288fe *) remove obsolete http_conf_globals.h
*) simplify all this #ifdef'ing: just nuke the unixd.h header. it isn't
   actually needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88045 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 03:03:18 +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
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
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
Jeff Trawick
78dc9b739f fix a warning on platforms where <strings.h> is needed for str[n]casecmp()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87693 13f79535-47bb-0310-9956-ffa450edef68
2001-01-15 20:23:12 +00:00
Jeff Trawick
83b77a0d64 only handle the request if server-info is the handler
Submitted by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87645 13f79535-47bb-0310-9956-ffa450edef68
2001-01-10 19:23:25 +00:00
Jeff Trawick
24588fe387 get mod_info working again (mostly)
(I guess I should simply zap the code to list the handlers
for each module?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87642 13f79535-47bb-0310-9956-ffa450edef68
2001-01-10 17:31:04 +00:00
Jeff Trawick
5c1d33b606 Fix a segfault in mod_info. mod_info_module_cmds() had a misstep when
reaching the end of the configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87128 13f79535-47bb-0310-9956-ffa450edef68
2000-11-29 15:16:54 +00:00
Ryan Bloom
b62a882802 Port mod_info to 2.0. This is basically a complete re-write to use the
config tree instead of re-reading the config file.  As a part of this
change, the config tree needs to be exposed to modules as ap_conftree.
Submitted by:	Ryan Morgan <rmorgan@covalent.net>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86948 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 01:55:26 +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
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
Jeff Trawick
53285171d4 Fix parameter list to ap_pcfg_openfile().
(No, this doesn't get mod_info to compile...  No, I'm not working
on mod_info...  I happened to notice the bad call so I fixed it.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86260 13f79535-47bb-0310-9956-ffa450edef68
2000-09-20 14:11:22 +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
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
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
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
Roy T. Fielding
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
Manoj Kasichainula
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
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
Martin Kraemer
9f432e5ea4 I am not claiming that the modules work now, but at least the parameter lists
are prepared for the updated ap_log_rerror() format. BTW: What is APLOG_NOERROR
for now that we have an explicit error code? This is still WIP!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84023 13f79535-47bb-0310-9956-ffa450edef68
1999-10-22 16:01:27 +00:00
Martin Kraemer
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
Ryan Bloom
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
Roy T. Fielding
bf83ee06d6 Remove ap_excess_requests_per_child reference that broke compilation,
for now anyway.  Likewise for run mode, which is now obsolete.

Submitted by:	Manoj Kasichainula


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83792 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 17:30:18 +00:00
Roy T. Fielding
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
Roy T. Fielding
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