1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-30 15:01:14 +03:00
Commit Graph

64 Commits

Author SHA1 Message Date
Ryan Bloom
d85bbfb847 This begins to remove BUFF from the server. The idea is to go very slowly
with this.  To begin with, we store both the socket and the BUFF in the
conn_rec.  Functions are free to use which ever they want, in the end all
of the data goes to the same place.  This modifies all of the MPMs except
Windows.  All of the Unix MPMs are working, but the others need to be
tested.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86651 13f79535-47bb-0310-9956-ffa450edef68
2000-10-18 19:12:16 +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
Ryan Bloom
ae7cca1bd9 Remove IOLs from Apache. They are no longer necessary, now that we have
filtering beginning to work.  There is a hack that has been repeated
through this patch, we morph a pipe into a socket, and put the socket
into the BUFF.  Everytime we do that, we are working with a pipe from
a CGI, and we should be creating a pipe bucket and passing that bucket
back.  Because we don't actually have pipe buckets yet, we are using this
hack.  When we get pipe buckets, this will be fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86136 13f79535-47bb-0310-9956-ffa450edef68
2000-08-23 00:01:58 +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
Brian Havard
be3e863d2a Fix warnings about string functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85996 13f79535-47bb-0310-9956-ffa450edef68
2000-08-05 16:04:56 +00:00
Ryan Bloom
2a87aae0db Convert all of the apr_listen.h to ap_listen.h. This was a side effect
of Doug M. big change last night.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85977 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 14:44:51 +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
Ryan Bloom
c266de9029 Remove iol_socket.h. This file had one declaration, and it makes more
sense for that declaraion to move to ap_iol.h.  This also modifies all of
the files that include iol_socket.h to include ap_iol.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85934 13f79535-47bb-0310-9956-ffa450edef68
2000-07-29 16:24:15 +00:00
Brian Havard
1610c8d4f5 OS/2: Put back creation of listeners in main thread in spmt_os2 MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85856 13f79535-47bb-0310-9956-ffa450edef68
2000-07-16 07:12:42 +00:00
Brian Havard
38b39b25c1 Get smpt_os2 working again after recent reorganization.
- globalize & namespace protects server_conf as ap_server_conf
- puts setup_listeners back in under a more appropriate name
  (setup_listen_poll()) as it's quite different to ap_setup_listeners in
  mpm_common.c.
- fake a suitable parameter to ap_process_child_status() as it assumes a child
  refers to a process when, in the context of spmt_os2, it's a thread.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85841 13f79535-47bb-0310-9956-ffa450edef68
2000-07-14 14:45:33 +00:00
Bill Stoddard
c4aeab10dc #ifdef APR_HAS_OTHER_CHILD to #if APR_HAS_OTHER_CHILD. Not tested.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85821 13f79535-47bb-0310-9956-ffa450edef68
2000-07-11 22:12:18 +00:00
Ryan Bloom
c3379e5fef Make the spmt_os2 MPM use the new setup_listeners API. This should work,
but I make no garauntees.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85812 13f79535-47bb-0310-9956-ffa450edef68
2000-07-10 23:12:10 +00:00
Ryan Bloom
f23ce00e31 Move sock_disable_nagle to mpm_common.c. Rename it to ap_sock_disable_nagle.
Again, I tried to modify all MPMs that are currently using this code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85811 13f79535-47bb-0310-9956-ffa450edef68
2000-07-10 22:08:11 +00:00
Ryan Bloom
c481bb225a Move setup_listeners to listen.c. This renames it to ap_setup_listeners,
and removes the duplicated code from all effected MPMs.  The only this
doesn't touch, is Windows.  That MPM was using a different setup_listeners.
If one of the Windows guys would like to modify the WinNT MPM to use the
same setup_lsiteners, that would be VERY cool.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85809 13f79535-47bb-0310-9956-ffa450edef68
2000-07-10 21:37:23 +00:00
Ryan Bloom
074e3c2fb4 Move process_child_status to mpm_common.c. This requires re-naming it
to ap_process_child_status and opening up ap_coredump_dir.  I have
modified all of the MPMs that I saw using this function to work with this
patch.  Sorry if I broke anybody.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85808 13f79535-47bb-0310-9956-ffa450edef68
2000-07-10 18:21:24 +00:00
Bill Stoddard
d92be21f38 Allocate iols out of the ptrans pool rather than mallocing them out
of the heap. The extra malloc/free is a significant performance
hit on some platforms and repeatedly alloc/freeing small chunks of storage
can fragment the heap.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85770 13f79535-47bb-0310-9956-ffa450edef68
2000-07-05 19:40:39 +00:00
Ryan Bloom
114fb2e4ac Combine some common code. Before this, all platforms implemented their
own iol_sockets using APR.  This just combines all of that code to a
common file and moves that file to main.  I have tested this with all of
the Unix MPM's, but I am willing to bet I missed something (Makefiles) for
Windows, and possibly moving some code for OS/2 and BeOS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85732 13f79535-47bb-0310-9956-ffa450edef68
2000-06-30 18:08:13 +00:00
Brian Havard
5b2a5ff8fa Clean up some warnings by including appropriate headers &
removing an unused variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85688 13f79535-47bb-0310-9956-ffa450edef68
2000-06-25 08:22:13 +00:00
David Reid
7966a8fc69 Add the ap_get_max_daemons to dexter, prefork and spmt_os2 MPM's. The only
one now lacking it is winnt, but that'll need someone form the winnt camp
to sort out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85652 13f79535-47bb-0310-9956-ffa450edef68
2000-06-22 00:28:33 +00:00
Jeff Trawick
973c011cb7 Fix error messages issued from MPMs which explain where to change
compiled-in limits (e.g., ThreadsPerChild, MaxClients, StartTreads).

missing: the same minor changes for the 2nd BeOS MPM

Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85645 13f79535-47bb-0310-9956-ffa450edef68
2000-06-21 13:15:30 +00:00
Ryan Bloom
09076e771a Clean up the stat commit. Basically there was one struct stat that I
missed converting to ap_finfo_t.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85545 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 18:07:43 +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
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
Ryan Bloom
0cc2db9987 Add pre_config hooks back in for all modules. This is important for the
server tokens code that is coming soon.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85378 13f79535-47bb-0310-9956-ffa450edef68
2000-06-02 15:33:20 +00:00
Brian Havard
9d8956eb73 Switch to APR's ap_probe_writable_fds() in spmt_os2 MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85335 13f79535-47bb-0310-9956-ffa450edef68
2000-05-28 12:45:58 +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
5e05af51e4 Pass the process_rec to the MPM to allow rewriting of the args list.
Especially necessary under Win32, or other non-unix front ends where
  oddball arguments might be required, but without causing a mess in
  http_main.c.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85311 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 06:22:55 +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
Bill Stoddard
4bd0fe1c28 Create new function, ap_lingering_close(), which will explicitly do a lingering close
if USE_SO_LINGER is not defined. Move responsibility for closing connections out
of http_connection.c and into the MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85194 13f79535-47bb-0310-9956-ffa450edef68
2000-05-11 21:17:00 +00:00
Ryan Bloom
8c385f0dbd Make reliable piped logs work on 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85136 13f79535-47bb-0310-9956-ffa450edef68
2000-05-04 04:02:37 +00:00
Brian Havard
cf313109f0 OS/2: Clean up spmt_os2 mpm to get shutdowns working cleanly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84999 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 14:56:36 +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
Ryan Bloom
3fa139e050 Put the pre_config hook back into the table. This solves the problem of
the pre-config hook only being valid for MPM's.  This patch also
distinguishes between STANDARD modules and MPM's.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84862 13f79535-47bb-0310-9956-ffa450edef68
2000-03-30 15:30:36 +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
Brian Havard
e1802b36e6 Fix include file order.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84705 13f79535-47bb-0310-9956-ffa450edef68
2000-03-03 14:24:40 +00:00
Brian Havard
90ea71ab2e Get OS/2 working with new configure system. Yay! :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84522 13f79535-47bb-0310-9956-ffa450edef68
2000-01-26 07:51:45 +00:00
Manoj Kasichainula
1582947dd5 Get rid of ap_check_signals() in all but the prefork MPM, and #define it
away there. It's a TPF-specific piece that will likely go into a TPF
MPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84199 13f79535-47bb-0310-9956-ffa450edef68
1999-12-01 00:45:02 +00:00
Manoj Kasichainula
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
Manoj Kasichainula
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
Ryan Bloom
409d49d2f2 Remove the ap_thread_mutex code from all MPM's. This code isn't actually
being called anywhere, and I have compiled dexter, mpmt_pthread, and
prefork without it.  Away it goes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84138 13f79535-47bb-0310-9956-ffa450edef68
1999-11-19 20:27:32 +00:00
Ryan Bloom
e0ff64c186 Finish the conversion from fprintf(stderr -> ap_log_err.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84135 13f79535-47bb-0310-9956-ffa450edef68
1999-11-19 18:49:20 +00:00
Ryan Bloom
370fc31b00 Cleanup the ZZZ comments. Basically these used to mark places where APR
is needed.  It is much easier to do this conversion by hand than by
searching for old comments, so they are going away now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84128 13f79535-47bb-0310-9956-ffa450edef68
1999-11-16 18:32:05 +00:00
Brian Havard
1ef7c3d415 OS/2: When shutting down, kill off child threads properly before shutting
down parent thread.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84083 13f79535-47bb-0310-9956-ffa450edef68
1999-11-01 11:25:04 +00:00
Brian Havard
9da853286c OS/2: Bump up thread stack size. 64k just wasn't enough when doing
sub-requests in mod_include.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84082 13f79535-47bb-0310-9956-ffa450edef68
1999-11-01 10:58:55 +00:00
Brian Havard
9997c83303 OS/2: APRize iol_socket
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84068 13f79535-47bb-0310-9956-ffa450edef68
1999-10-29 14:37:31 +00:00
Brian Havard
df37d04f04 Add a context parameter to ap_accept() for the connection socket to be
allocated from. This is needed because the lifetime of a connection is
ususally much shorter than that of the listen socket. Only tested on
OS/2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84031 13f79535-47bb-0310-9956-ffa450edef68
1999-10-24 13:08:30 +00:00
Brian Havard
243005861c Enhancements for APR network_io. Adds separate local/remote access methods for
a socket's port, IP address and sockaddr_in.

Updates for Apache code to use these, allowing the correct IP address of
clients to be logged.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84029 13f79535-47bb-0310-9956-ffa450edef68
1999-10-24 05:59:22 +00:00
Brian Havard
3c6a4c71fd Apply ap_log_error() errno parameter addition to a few more files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84008 13f79535-47bb-0310-9956-ffa450edef68
1999-10-20 15:15:41 +00:00
Brian Havard
6e5821ceb5 Update spmt_os2 MPM with APR changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84001 13f79535-47bb-0310-9956-ffa450edef68
1999-10-18 17:00:43 +00:00