Commit Graph

2013 Commits

Author SHA1 Message Date
a2bf1b4753 cast ap_snprintf() argument to the type expected by the format string
(to fix gcc warning on FreeBSD)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85506 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 18:51:24 +00:00
fe6fe52a8c Get FreeBSD 3.4 building again. It doesn't have lib dl, so the build
was broken as of the time we started always sticking in -ldl.

src/modules/standard/config.m4:

. don't add "-ldl" to LIBS for FreeBSD either
. back out previous change regarding LTFLAGS; it should be o.k.
  to add it for any platform, because libtool knows what to do with
  it (no, Greg A., I haven't added support for it to OS/390 libtool
  yet :) )

src/lib/apr/configure.in:

. if dlopen() isn't found in lib dl, don't fret (yet); try to find
  it in the default libraries;


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85505 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 18:20:35 +00:00
ba532e1de1 hi Toto!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85504 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 17:21:46 +00:00
697b6861d1 perfect blue sky. Ain't CA wonderful?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85503 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 17:12:01 +00:00
a6c0539629 clouds? what are those?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85502 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 17:07:30 +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
88b6c4ac2b Get FreeBSD building again with the resource limiting changes (FreeBSD
3.4, at least).

rlim_t is defined in <sys/types.h>, so we usually need that.

Some stuff in <sys/resource.h> needs <sys/time.h> for timeval just to
be able to compile :(


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85500 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 12:02:29 +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
0ecf437ac8 Fix a Solaris compilation problem with mod_cgid:
Use <sys/un.h> to get sockaddr_un.  Previously we declared it ourselves
for unknown reasons.  I am now able to compile on Linux (RH6.1), Solaris
8, and FreeBSD 3.4.  Also, I don't see a mention in UNP V1 (2e) of the
need to play tricks to get sockaddr_un.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85498 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 11:25:26 +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
a5cccc2b0b another iteration on the saferead/bhalfduplex stuff ... there was a
commented out bhalfduplex call which ryan missed; and which was a bit
more troublesome to solve with the iol interface.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85494 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 02:06:02 +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
2c4df0c614 Looking good outside.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85492 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 01:32:35 +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
d01fb3c907 PR:
Obtained from:
Submitted by:
Reviewed by:

  Andrew Braund's very complete review of the Win32 documentation!
  These should have a profound effect on the number of Win32 inquiries
  and problem reports.

  I will have some minor notes on running as another user, and
  using the perl .dsp conversion scripts to add as a seperate
  commit later today.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85484 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 18:33:02 +00:00
86b74c367a mention date of 2.0a4 release; mention a mod_cgid bug
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85482 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 15:22:12 +00:00
45df6f06a6 When mod_cgid is started as root, the cgi daemon now switches
to the configured User/Group (like other httpd processes)
instead of continuing as root.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85481 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 15:20:13 +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
20c08c06da fix typo in AC_TYPE_RLIM_T
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85477 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 23:12:22 +00:00
568362d70c Fix the check for rlim_t correctly. I wish I had known that we had
created an rlim_t check in acinclude.m4.  :-)
Submitted by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85476 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 21:32:13 +00:00
29a2154b85 ARGH! resource.h lives in sys.
Submitted by:	Doug M.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85475 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 20:30:58 +00:00
e629f47a13 Include a definition of rlim_t if the platform doesn't have it natively.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85474 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 20:21:35 +00:00
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
9578f8bffc a couple of data type issues have a more generic solution
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85466 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 04:15:47 +00:00
ebba9a0475 sleep until the next second, rather than sleep for <current-time> seconds.
fix typo on symbol (prevented compilation)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85465 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 02:56:27 +00:00
074aa6aec7 Fix some problems with the time commit. I guess mod_unique_id isn't turned
on by default, which is why my last build's didn't catch this.  I'll be
more careful in the future.
Submitted by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85464 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 01:47:21 +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
75f76def88 Fix Win32 bug when pathname length exactly equals MAX_PATH.
This bug caused directory index to be displayed rather than
returning an error.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85461 13f79535-47bb-0310-9956-ffa450edef68
2000-06-07 22:50:15 +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
95be9186ab Forgot to include when I committed the code change..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85459 13f79535-47bb-0310-9956-ffa450edef68
2000-06-07 16:23:46 +00:00
79d04b35a1 Greg Ames' mod_mmap_static fixes have been applied, so remove the
corresponding entry.

Fix typo in Greg Stein's note about gethostbyname_r().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85458 13f79535-47bb-0310-9956-ffa450edef68
2000-06-07 13:47:20 +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
78a645f5df Fix some bad (1.3 style) parmlists to ap_log_error() which were introduced
with the reintroduction of resource limiting logic.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85456 13f79535-47bb-0310-9956-ffa450edef68
2000-06-07 11:51:49 +00:00
56721971a1 combine two entries because they just *cannot* be separated...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85455 13f79535-47bb-0310-9956-ffa450edef68
2000-06-07 02:06:49 +00:00
115d32c361 Fix a couple of bugs in mod_cgid:
The cgi arguments were sometimes mangled because no terminating '\0' was
added to the arg string passed to the cgi daemon.

The len parm to accept() was not initialized, leading sometimes to an
endless loop of failed accept() calls on OS/390 and anywhere else that
failed the call if the len was negative.

Tweaks: Add some traces for failed socket calls at cgi daemon setup time
(most of which I hit while playing around).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85452 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 22:22:52 +00:00
1b501acd8b little wooden boy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85451 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 21:46:40 +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
704abb198b OS/390: avoid unconditional -ldl and -export-dynamic (other
platforms can add related logic to the case statement)

This is a stop-gap measure until the need for certain libraries
can be determined automatically.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85448 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 21:27:54 +00:00
1837ae341b Bring forward a change from 1.3 (the ability to use SetEnvIf*
and BrowserMatch* in .htaccess files).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85447 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 20:41:45 +00:00
63066cda29 Bring forward a fix from 1.3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85446 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 20:39:50 +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
71a767ce58 Fix zombie process problem with mod_cgi. This problem was introduced
as part of the "Convert ap_proc_t to a complete type." enhancement.

mod_cgi previously declared a ptr to an ap_proc_t, storage was allocated
by ap_create_process() from the request pool, and the ap_proc_t address
was passed to ap_note_subprocess().

With the "Convert ap_proc_t to a complete type." change, ap_proc_t
lived in autodata, but the address was still passed to
ap_note_subprocess().  When the pool was cleaned up, the ap_proc_t
in autodata had been used for something else, so the contents were
garbage, but pool cleanup needed the contents, especially the os
pid to pass to waidpid().  Since this was garbage, we never reaped
status from the cgi child and thus the cgi child remained a zombie.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85441 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 05:58:16 +00:00
9445b0807b PR:
Obtained from:
Submitted by:
Reviewed by:

  Fix a silly oversight.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85440 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 05:00:49 +00:00
1ad75f891b PR:
Obtained from:
Submitted by:
Reviewed by:

  Hmmm... exporting a hook, very interesting :-)

  But the win32 build believes hooks are pretty uninteresting, mostly
  static __cdecl calls, so pound this declaration into NONSTD.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85439 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 04:11:08 +00:00
343754d3f2 PR:
Obtained from:
Submitted by:
Reviewed by:

  Just two quick fixes for the ApacheCore/ApacheCoreDll.dsp project split.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85438 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 01:55:44 +00:00
c84d2199e5 Port mod_mmap_static to 2.0. Make it go faster.
core: Export core_translate() as ap_core_translate() for use by
      mod_mmap_static.
Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85437 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 01:49:30 +00:00