1
0
mirror of https://github.com/apache/httpd.git synced 2025-06-04 21:42:15 +03:00

154 Commits

Author SHA1 Message Date
André Malo
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
André Malo
e88fcf3c64 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102589 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 13:58:22 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
Martin Kraemer
ac8b37fd20 PR:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102187 13f79535-47bb-0310-9956-ffa450edef68
2004-01-05 10:34:07 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
Joe Orton
c555033723 * server/main.c (suck_in_expat): Remove function, USE_EXPAT is never
defined.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102012 13f79535-47bb-0310-9956-ffa450edef68
2003-12-10 13:43:14 +00:00
Jeff Trawick
e933536f5a Clean up httpd -V output: Instead of displaying the MPM source
directory, display the MPM name and some MPM properties.

Submitted by: Geoffrey Young <geoff apache.org>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101978 13f79535-47bb-0310-9956-ffa450edef68
2003-12-04 03:05:42 +00:00
Jeff Trawick
1dc6636640 tidy up some charset recoding issues
the "need" for APACHE_XLATE went away some years ago when BUFF went
POOF and charset recoding (translation) of non-protocol data
could no longer be performed by the core...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101894 13f79535-47bb-0310-9956-ffa450edef68
2003-11-26 02:09:25 +00:00
Martin Kraemer
1143775b66 Documentation says -DDUMP_VHOSTS is equivalent to setting -S
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101196 13f79535-47bb-0310-9956-ffa450edef68
2003-09-08 16:39:04 +00:00
Jeff Trawick
aa21671e13 switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
2003-09-03 19:27:12 +00:00
Jeff Trawick
2bbb0252b6 add a hint about handling of IPv4-mapped IPv6 addresses
to the output of httpd -V


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98753 13f79535-47bb-0310-9956-ffa450edef68
2003-02-22 14:32:39 +00:00
Justin Erenkrantz
1a344d46b6 Allow restart of httpd to occur even with syntax errors in the config
file.  (Out-of-date DSOs with bad MMNs will still be fatal unfortunately.)

Add return parameter to ap_process_config_tree - OK on success, !OK on
syntax error.  We will no longer call exit() from ap_process_config_tree.
The caller must exit if there is an error (makes sense anyway).  This allows
the initial start-up code to delay the exit until trying to let the
signal_server optional function execute first.

(The chances are that the syntax error isn't in the PidFile directive.  If
that happens, we'll try the default one.  Oh, well.)

PR: 16813


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98693 13f79535-47bb-0310-9956-ffa450edef68
2003-02-17 07:04:50 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
Bradley Nicholes
a6d627ff01 Enabled the -n parameter on NetWare to allow the administrator to rename
the console screen


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98535 13f79535-47bb-0310-9956-ffa450edef68
2003-01-29 17:09:50 +00:00
Jeff Trawick
8aab220f59 don't use deprecated function apr_sort_hooks()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97242 13f79535-47bb-0310-9956-ffa450edef68
2002-10-16 18:03:44 +00:00
Aaron Bannert
b5be533385 Add -S as a synonym for -t -DDUMP_VHOSTS
Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Aaron Bannert


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97120 13f79535-47bb-0310-9956-ffa450edef68
2002-10-07 01:39:20 +00:00
William A. Rowe Jr
e01dcce377 We log this failure (with an identical message) in the restart loop code,
there's no reason not to note it in the preflight pass.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96827 13f79535-47bb-0310-9956-ffa450edef68
2002-09-15 21:34:08 +00:00
William A. Rowe Jr
a5de2a2ff9 suck_in wasn't sucking hard enough. Fixed the header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96092 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 07:10:52 +00:00
William A. Rowe Jr
7c4af3aa9e Doc it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95871 13f79535-47bb-0310-9956-ffa450edef68
2002-06-23 10:27:54 +00:00
William A. Rowe Jr
010e521924 -T hasn't been supported for some great while.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95618 13f79535-47bb-0310-9956-ffa450edef68
2002-06-12 19:34:56 +00:00
Jeff Trawick
4c133221e0 Fix the display of the default name for the mime types config
file.

PR:           9729
Submitted by: Matthew Brecknell <mbrecknell@orchestream.com>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95591 13f79535-47bb-0310-9956-ffa450edef68
2002-06-10 16:43:52 +00:00
Jeff Trawick
fc658e628b the "-k startssl" parameter is reverted by popular demand
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95269 13f79535-47bb-0310-9956-ffa450edef68
2002-05-24 18:48:10 +00:00
Jeff Trawick
e801e407fc issue the usage message if there are extraneous arguments on
the command line


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95254 13f79535-47bb-0310-9956-ffa450edef68
2002-05-23 18:52:26 +00:00
Jeff Trawick
0547e6e6e9 Add "-k start|startssl|restart|graceful|stop" support to httpd
for the Unix MPMs.  These have semantics very similar to the
old apachectl commands of the same name.

The use of stderr/stdout and exit status for error conditions
needs to be revisited.  For now it matches apachectl behavior.

Justin Erenkrantz got the ball rolling with this feature.  Some
of his support code was used unchanged.  Other code was shuffled
around and modified or rewritten.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95237 13f79535-47bb-0310-9956-ffa450edef68
2002-05-23 12:58:37 +00:00
Jeff Trawick
e6f51fa631 fix a spelling error in a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95236 13f79535-47bb-0310-9956-ffa450edef68
2002-05-23 12:20:56 +00:00
Aaron Bannert
b5db596b6f Omit the second linefeed after "Syntax OK"
Submitted by:	Joe Orton <jorton@redhat.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95206 13f79535-47bb-0310-9956-ffa450edef68
2002-05-21 15:40:51 +00:00
Jeff Trawick
c871b41d3c stop using APLOG_NOERRNO in calls to ap_log_?error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95149 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 11:11:39 +00:00
William A. Rowe Jr
a43f5c4eb3 Introduced -E startup_logfile_name option to httpd to allow admins
to begin logging errors immediately.  This provides Win32 users
     an alternative to sending startup errors to the event viewer, and
     allows other daemon tool authors an alternative to logging to stderr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94681 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 16:36:28 +00:00
William A. Rowe Jr
01ba81a1f4 Correct const'ness of argv in all support apps, and use the new
apr_app_initialize over apr_initialize for win32, and other platforms
  that may wish to tweak 'apr-ized' application support (e.g. Netware?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94633 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:35:18 +00:00
Jim Jagielski
cc7157e782 Added support for Posix semaphore-based mutex locking (AcceptMutex posixsem).
It's between pthread and sysvsem in the DEFAULT priority ranking. This
makes it the new default for Darwin, and adds support for it for other
platforms as well (like Solaris).
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94434 13f79535-47bb-0310-9956-ffa450edef68
2002-04-04 18:36:03 +00:00
William A. Rowe Jr
1a167d571f Integrate rbb's forward port of -k config into the -h(elp), and
reorder some directives in the -h(elp) so they 'flow'.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94160 13f79535-47bb-0310-9956-ffa450edef68
2002-03-25 19:04:28 +00:00
Bill Stoddard
89b670a875 Tag some pools
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94140 13f79535-47bb-0310-9956-ffa450edef68
2002-03-22 20:24:22 +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
Sander Striker
30a517c723 Style Police comming through...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93813 13f79535-47bb-0310-9956-ffa450edef68
2002-03-09 14:13:49 +00:00
William A. Rowe Jr
689ebbaf88 For fat-fingered friends and others who like typing err and warn rather
than spelling it out on the -e argument.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93656 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 06:48:02 +00:00
Aaron Bannert
e52a26d698 This comment is bogus since we decided to keep -X.
Obtained from:  Thom Park <tpark@borland.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93440 13f79535-47bb-0310-9956-ffa450edef68
2002-02-15 23:21:14 +00:00
William A. Rowe Jr
0e92f35074 NOERRNO? Of course we have an ERRNO :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93240 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 23:30:37 +00:00
Ryan Bloom
19613bbf38 This patch allows the prefork MPM to print messages to the console if it
can't open a socket for some reason.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93224 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 16:58:54 +00:00
Aaron Bannert
d5fdaf9cfd The pre_config hook now takes a return value. This allows modules to
cause the server to bail out under error conditions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93063 13f79535-47bb-0310-9956-ffa450edef68
2002-01-28 23:49:40 +00:00
Jeff Trawick
14d74bce53 get the declaration of strcasecmp() on AIX
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92893 13f79535-47bb-0310-9956-ffa450edef68
2002-01-17 22:28:08 +00:00
William A. Rowe Jr
a5a68267b1 Allow the user to get detailed debugging information without a full
recompile [absolutely necessary on Win32 and other platforms that
  really don't support administrator-compilation.]

  -e level  follows the LogLevel options.

  The only question, should -e override the compiled-in default for
  the creation of the server_rec?  No strong feeling either way, here.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92891 13f79535-47bb-0310-9956-ffa450edef68
2002-01-17 20:15:12 +00:00
David Reid
bee20f4291 Restore the apr_pool_clear calls to main.c in case we have
third-parties who are overriding the open_logs hook, in which case
they'd miss the plog being cleared.

Submitted by:	Justin <jerenkrantz@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92771 13f79535-47bb-0310-9956-ffa450edef68
2002-01-08 17:07:19 +00:00
David Reid
c229fe732d This small patch modifies the log's to use plog instead of pconf.
Basically pconf is cleared at different times from plog, and this
has the effect of leaving stderr closed when going into the next
stage of the config. This also had the effect of allowing FreeBSD
with threads to create a pipe with stderr's fd at one end, and this
resulted in problems with the signal polling and high cpu usage.

In addition, move the clearing of plog from main.c to core.c where
it seems more appropriate.

This solves the first and main problem that FreeBSD has with the
threaded MPM's.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92769 13f79535-47bb-0310-9956-ffa450edef68
2002-01-08 16:30:16 +00:00
Jeff Trawick
3d34976f3d tag a few of the key httpd pools
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92519 13f79535-47bb-0310-9956-ffa450edef68
2001-12-18 20:26:15 +00:00
Jeff Trawick
638228a804 hmmm... gcc 2.95.2 on AIX says sizeof is long... fix up
a printf to always have a match between the format string
and argument


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92339 13f79535-47bb-0310-9956-ffa450edef68
2001-12-05 15:41:25 +00:00
Jeff Trawick
83c1a870b3 tweak httpd -V output to show the architecture (bits in a pointer)
and whether or not APR_HAS_SENDFILE is defined


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92322 13f79535-47bb-0310-9956-ffa450edef68
2001-12-04 18:36:51 +00:00
Ben Laurie
ed6f86a314 Handle the ? option.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92296 13f79535-47bb-0310-9956-ffa450edef68
2001-12-03 14:28:39 +00:00
William A. Rowe Jr
259c861166 Finish undoing that last patch... previous commit simply cleaned it up,
I was working with an unsaved verison when I pushed the button.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92246 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 07:30:49 +00:00
William A. Rowe Jr
df539edda8 Revert my last patch to detect a 'leftover' arg. Apparently there is
no way to distinguish between an extra arg, and a -x foo arg, or else
  our getopt is broken at the moment.

  I can't dig further into getopt right now, so this will wait for another
  day or another hacker to resolve.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92243 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 07:27:57 +00:00
William A. Rowe Jr
0f6e70ed8d We never tested for invalid 'additional' arguments that were ignored.
Was there any point to allowing additional, unused args after the
  various supported switches?

  This prevents the Apache server from starting with an httpd somefooness
  invocation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92241 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 07:10:40 +00:00