1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

274 Commits

Author SHA1 Message Date
Jim Jagielski
70bb2575ea The old, legacy (and unused) code in which the scoreboard was totally
and completely contained in a file (SCOREBOARD_FILE) has been
removed. This does not affect scoreboards which are *mapped* to
files using named-shared-memory at all. This implies that scoreboards
must be based, at some level, on native shared memory (mmap, shm_open,
shmget, whatever), but the code has assumed that for quite awhile
now. Having the scoreboard be *based* on a file makes no sense today.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94306 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 14:33:50 +00:00
Bradley Nicholes
da65586a94 Added code to extract the current address space name so that each
instance of Apache can be identified by the address space that it is running in


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93934 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 16:48:19 +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
Brian Pane
90f63dfcd5 Removed unixd_set_lock_perms(apr_lock_t *), which is no longer
used by any of the MPMs.  (This is another step toward eliminating
the httpd's dependencies on the old lock API.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93558 13f79535-47bb-0310-9956-ffa450edef68
2002-02-24 08:33:56 +00:00
William A. Rowe Jr
3f92e8eca8 one blank line for code, one huge step for legibility
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92984 13f79535-47bb-0310-9956-ffa450edef68
2002-01-23 18:31:51 +00:00
Bradley Nicholes
26d3d725e5 Removed the multiple and reentrant flags that were being set by mistake
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92921 13f79535-47bb-0310-9956-ffa450edef68
2002-01-18 23:30:14 +00:00
Justin Erenkrantz
61d8e967e4 Spelling and grammar janitor coming through.
(Clean up the comment so that mortal beings can parse it.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92895 13f79535-47bb-0310-9956-ffa450edef68
2002-01-17 22:59:48 +00:00
Bill Stoddard
ca30c4d622 On HPUX 11.x, the 'ENOBUFS, No buffer space available'
error occures because the accept() cannot complete.
You will not see ENOBUFS at 10.20 because the kernel
hides any occurrence from being returned from user space.
ENOBUFS at 11.0 TCP/IP is quite possible, and could
occur intermittently. As a work-around, we are going to
ingnore ENOBUFS.

Submitted by: madhusudan_mathihalli@hp.com
Reviewed by: Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92894 13f79535-47bb-0310-9956-ffa450edef68
2002-01-17 22:35:09 +00:00
William A. Rowe Jr
7f6d76ce95 Follow our Unix bretherens' conventions, and name the sub-proxy modules
with the mod_ prefix (al la mod_dav_fs as a sub-dav module.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92876 13f79535-47bb-0310-9956-ffa450edef68
2002-01-17 01:05:23 +00:00
Bradley Nicholes
d1146dd589 Implemented a checkunload callback to allow apache to be unloaded using
the Unload console command.  Also changed the nlm name and console
command to APACHE2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92852 13f79535-47bb-0310-9956-ffa450edef68
2002-01-14 18:55:51 +00:00
Brian Pane
d5dbe606e3 Clear the output socket descriptor in unixd_accept() to make sure
we don't supply a bogus socket to the caller if the accept fails.
(This was causing problems in the worker MPM, which tried to process
the returned socket if it was non-NULL, even if unixd_accept()
returned an error.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92837 13f79535-47bb-0310-9956-ffa450edef68
2002-01-13 02:35:56 +00:00
William A. Rowe Jr
aff1454d34 *) Split all Win32 modules [excluding the core components mod_core,
mod_so, mod_win32 and the winnt mpm] into individual loadable
     modules, so the administrator may individually disable the former
     compiled-in modules by simply commenting out their LoadModule
     directives.  [William Rowe]

  *) Saved Win32 module authors and porters many future headaches, by
     duplicating the appropriate .h files such as os.h into the include
     directory, including in the build tree.  [William Rowe]

  Also noticed that version stamp resources weren't generated for proxy
  modules, this too is now fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92804 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 08:47:23 +00:00
Bradley Nicholes
54c2faac29 Added a stub for ap_os_create_privileged_process() for NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92776 13f79535-47bb-0310-9956-ffa450edef68
2002-01-08 21:32:50 +00:00
Bradley Nicholes
3356d10c5b Code updates to allow Mod_Rewrite and Mod_Auth_DBM to build on NetWare
Submitted by: G�nter Knauf <gk@gknw.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92775 13f79535-47bb-0310-9956-ffa450edef68
2002-01-08 21:16:08 +00:00
Greg Ames
652e5b19ce change ap_unix_create_privileged_process() to allocate enough space in
the newargs array to allow for a null terminator.  This allows suexec and
mod_cgid to work together reliably.

Apparently, rounding up the size to a multiple of 8 bytes in apr_palloc
hid the problem sometimes.  At other times, suexec would complain
about a null command name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92627 13f79535-47bb-0310-9956-ffa450edef68
2001-12-27 19:53:37 +00:00
David Reid
a9eff7270c Add ap_os_killpg as well as unixd_killpg and beosd_killpg.
Move the worker MPM to use ap_os_killpg in place of unixd_killpg as
this makes it more portable.

Ryan notes that really we should be using the POD mechanism to
control death of the child processes, so this is temporary until
we have that change in place.  Note added to STATUS to that effect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92598 13f79535-47bb-0310-9956-ffa450edef68
2001-12-25 12:24:14 +00:00
David Reid
eac4cc7db6 Add a beosd_accept function. If the worker MPM is used this is
needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92582 13f79535-47bb-0310-9956-ffa450edef68
2001-12-23 14:13:07 +00:00
Ryan Bloom
91aa604600 Allow modules that add sockets to the ap_listeners list to
define the function that should be used to accept on that
socket.  Each MPM can define their own function to use for
the accept function with the MPM_ACCEPT_FUNC macro.  This
also abstracts out all of the Unix accept error handling
logic, which has become out of synch across Unix MPMs.

The code flow is much easier now for different transports:

1)  During pre-config, post-config or while parsing the config
    file, add a socket to the ap_listeners list, making sure to
    define an accept function at the same time.

2)  MPMs find the correct listener, and call the accept function
    that was defined in step 1.

3)  That accept function returns a void pointer, which is passed
    to the create_connection hook.

4)  create_connection adds the correct low-level filters.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91916 13f79535-47bb-0310-9956-ffa450edef68
2001-11-13 22:42:38 +00:00
Bradley Nicholes
e304dcda41 Added the NetWare SSL module to the prebuilt module list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91905 13f79535-47bb-0310-9956-ffa450edef68
2001-11-13 17:39:29 +00:00
Ryan Bloom
aefc6b1525 Remove commas from the end of the macros that define
directives that are used by MPMs.  Previous to this patch,
you would use these macros without commans, which was unlike
any other directives. Now, after the macro, you must have
a comma.  This makes the macros look more like the rest of the
directives.

I know this is cosmetic, and I was going to leave it alone, but when
I found out that it bothered Cliff too, I decided to fix it after all.

Submitted by:	Ryan Bloom and Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91896 13f79535-47bb-0310-9956-ffa450edef68
2001-11-13 06:04:25 +00:00
David Reid
cfbe3f2f29 Get the daemon code working again for User/Group on BeOS,
but make them no-op's until we get multi-user for beos...
(yeah, right)

Suggested by Roy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91811 13f79535-47bb-0310-9956-ffa450edef68
2001-11-08 22:56:26 +00:00
Bradley Nicholes
150ae4611e Added the .xdc data file for building an MP enabled version of Apache on
NetWare


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91730 13f79535-47bb-0310-9956-ffa450edef68
2001-11-02 18:03:38 +00:00
Bradley Nicholes
49a703b254 Fix up exit() to make sure that things are cleaned up properly on error
conditions


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91690 13f79535-47bb-0310-9956-ffa450edef68
2001-10-29 22:55:13 +00:00
Bradley Nicholes
e3c179c820 Fixed to import the aprlib module and export the httpd api's
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91654 13f79535-47bb-0310-9956-ffa450edef68
2001-10-23 23:32:07 +00:00
William A. Rowe Jr
0a9f874084 Reimplement Win32 registry-based and shebang-extended scripting.
Accepts arguments of $* and %* for 'positioned' cgi envvars, provided they
  stand alone (aren't part of another arg.)

  Accepts %1 $1 syntax, quoted or not, but makes no attempt at palacating
  older programs with short paths, just yet.

  About as stable and robust as my first rewrite of dir_walk, so watch out!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91613 13f79535-47bb-0310-9956-ffa450edef68
2001-10-21 04:14:24 +00:00
Aaron Bannert
648ae56dba Use the APR's new OS-specific proc mutex accessors -- they are used
here to set permissions on SysV Semaphores. MPMs will be modified to
call this new function as they are ported to the new APR lock API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91579 13f79535-47bb-0310-9956-ffa450edef68
2001-10-19 23:32:43 +00:00
Bradley Nicholes
a2f7cb1412 OS specific header for NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91541 13f79535-47bb-0310-9956-ffa450edef68
2001-10-17 22:50:22 +00:00
Bradley Nicholes
a2c0d04e24 Temporarily removed the cgi module from the built in modules list until we
can figure out how to handle it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91540 13f79535-47bb-0310-9956-ffa450edef68
2001-10-17 22:49:39 +00:00
Bradley Nicholes
952645203d OS specific file for NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91513 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 23:25:46 +00:00
William A. Rowe Jr
d0646a92a6 Add some mime magic to the Win32 build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91291 13f79535-47bb-0310-9956-ffa450edef68
2001-10-04 19:38:16 +00:00
William A. Rowe Jr
283b4711eb Two more loadable modules on Win32, thank you Gunther!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91221 13f79535-47bb-0310-9956-ffa450edef68
2001-10-01 17:01:30 +00:00
William A. Rowe Jr
f377305ac3 /home/cvs/httpd-2.0/ no longer tracks makefiles. But at least incorporate
all the new proxy modules into BaseAddr.ref for win32.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91182 13f79535-47bb-0310-9956-ffa450edef68
2001-09-28 17:49:00 +00:00
Victor J. Orlikowski
f6b61e742b Added AP_DECLARE_DATA to unixd_config, so that it makes it into the exp file.
Submitted by: Mark Nesbitt <mnesbitt@us.ibm.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91022 13f79535-47bb-0310-9956-ffa450edef68
2001-09-13 20:41:15 +00:00
Ryan Bloom
73f768d207 rules.mk is stored in $(top_blddir). Without this change, VPATH builds
stop working.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91017 13f79535-47bb-0310-9956-ffa450edef68
2001-09-13 06:49:09 +00:00
Ryan Bloom
95f9ad5919 Use the correct macros in unix.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90808 13f79535-47bb-0310-9956-ffa450edef68
2001-08-30 06:36:41 +00:00
William A. Rowe Jr
43e6833734 * configure.in: added Cygwin specific APR_SETVARs.
* os/config.m4: added Cygwin specific values for $OS and $OS_DIR.
    $OS_DIR will change to "cygwin" as soon as I get the DSO/DLL things
    clean as with 1.3.20.

  * support/logresolve.c: added OS specific #ifdef statement to define
    h_errno as extern __declspec(dllimport); it's imported from the
    cygwin1.dll itself.

Submitted by: Stipe Tolj <tolj@wapme-systems.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90805 13f79535-47bb-0310-9956-ffa450edef68
2001-08-30 05:52:25 +00:00
William A. Rowe Jr
9e5e701581 No <sys/ipc.h> under cygwin.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90800 13f79535-47bb-0310-9956-ffa450edef68
2001-08-30 05:11:42 +00:00
Brian Havard
25cba1c7fe os-inline.c is no more...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90656 13f79535-47bb-0310-9956-ffa450edef68
2001-08-25 10:19:51 +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
Doug MacEachern
e7046a104f os-inline.c is no more (fix from bloom)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90578 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 19:45:17 +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
Joshua Slive
ae31fecbff This probably falls under the category: if you can't figure it out yourself,
you shouldn't be doing it.  But we might as well remove obsolete stuff.

PR: 4685


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90527 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 00:15:37 +00:00
Ryan Bloom
5895fdce9f We need to check for sys/sem.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90478 13f79535-47bb-0310-9956-ffa450edef68
2001-08-21 23:33:10 +00:00
Brian Havard
0dbd6fd8d8 OS/2: Use full set of linker flags when linking shared core loader EXE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90393 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 10:49:29 +00:00
Brian Havard
1378e68fbe OS/2: Don't share data segment between multiple instances of the shared core
as doing so makes a multi-process MPM crash & burn....


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90281 13f79535-47bb-0310-9956-ffa450edef68
2001-08-17 16:12:33 +00:00
Ryan Bloom
2e238e59eb Fix a new error on Linux.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90215 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 14:12:39 +00:00
Jeff Trawick
aee4f61414 The Unix MPMs other than perchild now allow child server
processes to use the accept mutex when starting as root and
using SysV sems for the accept mutex.  Previously, this
combination would lead to fatal errors in the child server
processes.  perchild can't use SysV sems because of security
issues.

translation: steal apache 1.3 code to call semop(IPC_SET) on
the semaphore to set permissions and uid/gid


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90213 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 13:59:14 +00:00
William A. Rowe Jr
78c17baa5b Nothing here to ignore, go away :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90207 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 07:31:17 +00:00
William A. Rowe Jr
db14e8faa7 A first step at auto-generating the version resource for all win32 binaries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90193 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 05:27:50 +00:00
Ryan Bloom
8006145310 Begin to sanitize the MPM configuration directives. Now, all
MPMs use the same functions for all common MPM directives.  This
should make it easier to catch all bugs in these directives once.

Everybody should check their favorite MPM to ensure that it still
compiles, and that these directives work.  This is a big patch, and
although it looks good, and things compiled for me, that is no
garauntee that it will work on all platforms.  :-)

Submitted by:	Cody Sherr <csherr@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90132 13f79535-47bb-0310-9956-ffa450edef68
2001-08-13 04:57:35 +00:00