Commit Graph

537 Commits

Author SHA1 Message Date
4f8f778113 Fix typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85542 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 17:40:00 +00:00
ec58094da8 All of Apache uses APR for shared memory, so Apache doesn't need to check
for SHM_[RW].


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85539 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 17:04:39 +00:00
b44c18edd7 Add a new function ap_set_default_fperms. This allows people to set the
umask to be used when creating files.  This should change the permissions
of files created using APR_DEFAULT_OS.  Also removed a warning introduced
with the sys/stat.h changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85537 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 16:00:33 +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
ad614825ba Make this build again...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85532 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 12:58:12 +00:00
a8591e550e Fix a couple of problems with the pre/post config processing changes:
1) symptom: on system with bad/no DNS setup, ServerName isn't
   processed so init fails

cause:

  ap_fini_vhost_config() called before ap_process_config_tree(), so
  ServerName was never stored in the config structure

2) symptom: on system with virtual hosts configured, SIGSEGV in
   open_multi_logs()

cause:

   the module configs for the virtual hosts haven't been merged in
   yet, and open_multi_logs() gets NULL for the mod_log_config
   configuration

This stuff needs to be cleaned up further, exploring the use of a
post-config hook for fixup_virtual_hosts(), ap_fini_vhost_config(),
and ap_sort_hooks(), getting a lot of logic out of main(), and
processing the config tree only once.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85522 13f79535-47bb-0310-9956-ffa450edef68
2000-06-11 22:06:57 +00:00
ef9d56268b Update dependencies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85516 13f79535-47bb-0310-9956-ffa450edef68
2000-06-11 14:12:03 +00:00
1252e4656e Fix dependencies for util_uri.lo and util.lo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85510 13f79535-47bb-0310-9956-ffa450edef68
2000-06-11 11:20:58 +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
cd6953bbf5 httpd -V now displays APR's selection of the lock mechanism instead of the
symbols previously respected by prefork.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85499 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 11:46:37 +00:00
dfb99092a3 fix nagle
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85495 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 02:22:15 +00:00
c69795a629 Update the Dexter MPM to use APR for shared memory. This removes a lot
of duplicate code and allows me to clean up some config stuff in a few
minutes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85493 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 01:35:59 +00:00
3eb76501e4 fix dependencies. (what is a .lo anyway? i tried making the .o depend
on the .h which is how dependencies usually work, but the other rules
didn't work out right unless i used a .lo ... i suppose this only matters
to folks building with -j N)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85491 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 01:10:10 +00:00
7e50066461 We don't ever actually use HAVE_CRYPT, so stop defining it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85489 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 22:37:50 +00:00
4e7616169e Remove waitpid from the config checks and all calls to waitpid from the
server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85488 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 22:05:36 +00:00
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
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
f6e8fe6781 The prefork MPM now uses an APR lock for the accept() mutex.
It has not been getting a lock at all recently.

Note: The TPF and SGI folks need to each APR how to get the most
efficient lock on those platforms.  (For SGI it depends on whether
or not we're building for SMP.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85479 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 14:48:58 +00:00
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
825b977744 Remove the check for difftime, we aren't actually using it anywhere.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85460 13f79535-47bb-0310-9956-ffa450edef68
2000-06-07 22:14:58 +00:00
28856f00f7 Change the mmap() feature test to check only for existence.
The autoconf-provided check used previously fails when the
platform doesn't support MAP_FIXED.  Apache doesn't use that
mmap() feature, so we don't want to require it.
Submitted by:	Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85457 13f79535-47bb-0310-9956-ffa450edef68
2000-06-07 12:36:51 +00:00
3c8e0cb24f Add the resource limiting code back to Apache 2.0. This only works on
Unix because I can't find any other platforms with rlimit.  If there are
other platforms that need this code, then some of the code needs to move.
This has just barely been tested, so it could probably use some good
testing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85449 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 21:45:16 +00:00
130e171d62 Increase the size of the buffer passed to ap_strerror(); I saw
truncation of a particularly long message on OS/390, and useful
info was past char 100.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85443 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 14:51:06 +00:00
b7d113d2b8 PR:
Obtained from:
Submitted by:
Reviewed by:

  Migrate the 'real' pre_config hook update from winnt.c to mpm_winnt.c
  and correct newly required symbols for http_main.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85436 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 01:20:04 +00:00
bcbcf75254 Remove some #ifdef'ed code that doesn't make much sense
(what does the 2 signify?)

Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85433 13f79535-47bb-0310-9956-ffa450edef68
2000-06-05 23:58:34 +00:00
20f66c9f65 PR:
Obtained from:
Submitted by:
Reviewed by:

  Unbind the old main_win32.c code and rebind to the new mpm logic
  in the modules/mpm/winnt directory.  Includes some simple cleanups.

  The old sources in os/win32 will disappear at the end of this week.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85430 13f79535-47bb-0310-9956-ffa450edef68
2000-06-05 22:39:03 +00:00
3983c8b6cd Make a copy of getenv("PATH") before storing for later use. Some
getenv() implementations use the same storage for successive calls.
CGIs on OS/390 had a bad PATH due to this.  (Believe it or not, ANSI
says getenv() can do this.)

Some similar getenv() usage was left alone as it was specific to a
certain platform, and I assume that getenv() doesn't have the "issue"
on those platforms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85427 13f79535-47bb-0310-9956-ffa450edef68
2000-06-05 20:45:08 +00:00
eda6e3d23c Add server tokens back to 2.0. Also bring forward the change to allow
the PRODUCT_ONLY value for ServerTokens.  This is relatively clean,
all of the code lives in http_core, and when a module wants to add a token,
they just call ap_add_version_component from the post_config hook.  Actually
ap_add_version_component can be done anytime after the config has been
parsed, it just makes the most sense to do it in post_config IMHO.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85426 13f79535-47bb-0310-9956-ffa450edef68
2000-06-05 19:44:02 +00:00
a6bc058266 Bring mpmt_beos up to date and allow it play nice with mpm_common.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85394 13f79535-47bb-0310-9956-ffa450edef68
2000-06-03 16:58:08 +00:00
71d8e39db6 Modify the config order so that we read the config, process all EXEC_ON_READ
directives at the same time, run pre_config hook for all modules, and
then walk the tree.  This allows all modules to have a pre_config hook and
know that it will be called at a reasonable time.  I also made "Include"
an EXEC_ON_READ directive so that it is included in the tree properly.
This was required after the other changes that were made.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85393 13f79535-47bb-0310-9956-ffa450edef68
2000-06-03 16:27:03 +00:00
730cec6b01 APACHE_XLATE, when doing translation that isn't single-byte-only
We must zap the Content-length header (if any).  Otherwise, the
browser will be seriously confused :)  The header is zapped in
ap_set_keepalive() right before we look for Content-length, transfer
encoding, HTTP level, etc. to decide, among other issues, whether or
not to turn on chunked encoding.  For HTTP 1.1, if we don't send
Content-length, we need to use chunked encoding, so we have to zap
the header before that decision.

Interestingly, in Russian Apache the Content-length header is
zapped after ap_set_keepalive() is called, so with HTTP 1.1 they
break the content-length-or-chunked rule.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85379 13f79535-47bb-0310-9956-ffa450edef68
2000-06-02 15:55:20 +00:00
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
e9a493b9be Fix a SIGSEGV in ap_md5digest() (bad parms to ap_seek()). This is used
when you have ContentDigest enabled and we can't/don't mmap the file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85373 13f79535-47bb-0310-9956-ffa450edef68
2000-06-01 22:52:50 +00:00
9d1a70c8d5 Add support for the BeOS mpm. Also change some things to make it easier
for future additions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85372 13f79535-47bb-0310-9956-ffa450edef68
2000-06-01 18:42:04 +00:00
0230ab1458 PR:
Obtained from:
Submitted by:
Reviewed by:

  Just a few error cleanups for tonight.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85363 13f79535-47bb-0310-9956-ffa450edef68
2000-06-01 03:20:09 +00:00
24beda9563 Remove a warning when compiled with --use-maintainer-mode. Basically,
process_rec should just be storing argv the same way that getopt
expects it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85361 13f79535-47bb-0310-9956-ffa450edef68
2000-05-31 22:06:33 +00:00
7825f17a52 PR:
Obtained from:
Submitted by:
Reviewed by:

  Quick patch to accomodate the mpm's rename to mpm_winnt.c/.h

  At least in the short term.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85359 13f79535-47bb-0310-9956-ffa450edef68
2000-05-31 15:28:52 +00:00
ce6df54a15 PR:
Obtained from:
Submitted by:
Reviewed by:

  First checkin of Win32 service control structure merged into the mpm.

  Project files to be updated with this 'experimental' implementation once
  peer review is complete and the module maintainer accepts the patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85358 13f79535-47bb-0310-9956-ffa450edef68
2000-05-31 15:15:31 +00:00
0a0fb25f0d PR:
Obtained from:
Submitted by:
Reviewed by:

  Ugh, sorry bout that... reversing out the last dsp6->dsp5 commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85355 13f79535-47bb-0310-9956-ffa450edef68
2000-05-30 22:56:36 +00:00
eb266c4118 PR:
Obtained from:
Submitted by:
Reviewed by:

  How, precisely, was Apache going to do anything with rewritten args ;-?
  +1 on my personal oh-duh tally for the weekend.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85354 13f79535-47bb-0310-9956-ffa450edef68
2000-05-30 22:54:31 +00:00
782de3b8d3 Forward fit a bug fix in the TAKE13 handling from 1.3 to 2.0
Submitted by:	Jon Travis <jtravis@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85353 13f79535-47bb-0310-9956-ffa450edef68
2000-05-30 15:56:18 +00:00
1d642bab66 We now report the correct line number for syntax errors in config
files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85348 13f79535-47bb-0310-9956-ffa450edef68
2000-05-30 02:42:32 +00:00
677c482d63 PR:
Obtained from:
Submitted by:
Reviewed by:

  One last precursor to the common code base for Win32 rewrite_args from
  it's MPM.  Since we need to walk the arg list... why maintain it in
  several places.  This patch adds the AP_SERVER_BASEARGS definition to
  the header, so any mpm (and mod_info, for example) can know what args
  are legitimate, even when they plan to ignore them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85340 13f79535-47bb-0310-9956-ffa450edef68
2000-05-29 04:17:41 +00:00
a32a5cddbf PR:
Obtained from:
Submitted by:
Reviewed by:

  Remove any possiblity of having multiple tags to correct as the version
  changes.  Split httpd.h's version into tokens.  Roll these tokens into
  registry.c

  TODO: Remove registry.c from the list of files to touch when rolling


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85338 13f79535-47bb-0310-9956-ffa450edef68
2000-05-28 17:52:19 +00:00
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
e960297d04 Add an mpm.h for spmt_os2 MPM so that mpm_common.c will build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85334 13f79535-47bb-0310-9956-ffa450edef68
2000-05-28 12:33:04 +00:00
7cdbb7194d Only compile ap_reclaim_child_processes() if a CHILD_INFO_TABLE is known.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85333 13f79535-47bb-0310-9956-ffa450edef68
2000-05-28 12:20:04 +00:00
f7e32fc893 PR:
Obtained from:
Submitted by:
Reviewed by:

  Finally a patch that can't (well, shouldn't :-) break any other platform.

  Open up the symbols defined for http_main.c to move main() from the core
  under Win32 (that's the real main(), not that apache_main() thing).

  Win32 Project file changes will follow in a seperate patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85326 13f79535-47bb-0310-9956-ffa450edef68
2000-05-28 03:52:42 +00:00
553f9f3e25 PR:
Obtained from:
Submitted by:
Reviewed by:

  Document the lack of exports so http_main.c stays that way,
  as suggested by Greg Stein.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85321 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 23:53:45 +00:00
3f29977506 PR:
Obtained from:
Submitted by:
Reviewed by:

  Reverse out additional linkage argument from DECLARE_HOOK
  and IMPLEMENT_HOOK macros.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85319 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 22:53:48 +00:00