1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-28 07:20:58 +03:00
Commit Graph

951 Commits

Author SHA1 Message Date
William A. Rowe Jr
de65e8cd0e Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.

  This needs further review, it's committed only as a stopgap for those
  who's builds I broke, sorry.  Review tbc late this evening.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87699 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 22:04:45 +00:00
Martin Kraemer
ba95d7940d Change everything to The Apache Software License 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87686 13f79535-47bb-0310-9956-ffa450edef68
2001-01-15 17:06:28 +00:00
William A. Rowe Jr
eaf753552c That's not a -D'ef - its an envar - you can't pass foo=bar in apache!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87682 13f79535-47bb-0310-9956-ffa450edef68
2001-01-13 23:30:53 +00:00
William A. Rowe Jr
43d0cfdb5e Eliminate a warning, pid is an int.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87681 13f79535-47bb-0310-9956-ffa450edef68
2001-01-13 05:09:02 +00:00
Bill Stoddard
501a0061f2 Fix a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87673 13f79535-47bb-0310-9956-ffa450edef68
2001-01-12 15:48:26 +00:00
Ryan Bloom
4f551be1ba Stop using environment variables to set ONE_PROCESS and NO_DETACH. Now
we use the -D command line argument to Apache to configure these
options.
Submitted by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87661 13f79535-47bb-0310-9956-ffa450edef68
2001-01-12 00:56:13 +00:00
Bill Stoddard
f39fd562f6 Change some INFO messages to DEBUG messages. Cleanup some message wording.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87653 13f79535-47bb-0310-9956-ffa450edef68
2001-01-11 15:10:10 +00:00
David Reid
e7ee420927 Tidy up the beos mpm a little.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87643 13f79535-47bb-0310-9956-ffa450edef68
2001-01-10 18:36:08 +00:00
Jeff Trawick
b7c731a325 get rid of some bogus uses of perror()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87627 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 04:40:22 +00:00
Jeff Trawick
8f0c8d4e7f fix some handler brokenness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87626 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 04:36:39 +00:00
Jeff Trawick
096826bef1 fix some handler brokenness so that dexter doesn't segfault at startup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87624 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 04:20:56 +00:00
Jeff Trawick
095717c705 get rid of some bogus uses of perror()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87620 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 00:27:03 +00:00
Doug MacEachern
40391fb9f2 adjust remaining modules to use the new handler hook method (Alan Edwards)
bring back the old handler prototype by reusing r->handler (dougm)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87617 13f79535-47bb-0310-9956-ffa450edef68
2001-01-08 23:55:12 +00:00
Brian Havard
894760c146 Handlers now use hooks, remove handlers entry from module data.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87611 13f79535-47bb-0310-9956-ffa450edef68
2001-01-08 13:32:16 +00:00
Brian Havard
68b9d88f89 Fix message when the error log file can't be opened.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87610 13f79535-47bb-0310-9956-ffa450edef68
2001-01-08 13:25:02 +00:00
Ben Laurie
778f927c42 Keep Greg happy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87608 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 23:04:15 +00:00
Ben Laurie
77f15c7732 Strip trailing stuff from mime types.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87607 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 22:45:26 +00:00
Ben Laurie
45f620672d Make handlers use hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87604 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 19:55:59 +00:00
Ryan Bloom
ab328cf0f3 Stop leaking sockets. This is a minimal leak, but it was there.
Basically, we were creating a socket_t, but never assigning a port or
IP address to it.  We then re-read the config file, and search the
list of allocated sockets for the socket that we have already allocated
for this port, but we never find the port and address, because we never
stored them in the socket_t.  This was keeping the Listen directive from
working properly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87601 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 05:51:23 +00:00
dgaudet
644cc2eefc - add some missing distclean targets
- use DISTCLEAN_TARGETS and CLEAN_TARGETS everywhere (to be consistent
with other macros and with APR)
- warn that aclocal.m4 is a generated file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87597 13f79535-47bb-0310-9956-ffa450edef68
2001-01-06 21:47:49 +00:00
David Reid
dc8ed8a7df This file needs to be renamed from config.m4 to config5.m4 to allow
the ordering to work correctly otherwise it breaks the build. It didn't
seem possible to move the file in CVS so I've added a new copy and
deleted the original.  It's such a simple file if we don't have the history
it's not an issue!

Submitted by:	Ryan Bloom <rbb@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87594 13f79535-47bb-0310-9956-ffa450edef68
2001-01-06 14:23:14 +00:00
Allan K. Edwards
0be0106405 add pool parameter to ap_is_directory and ap_is_rdirectory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87593 13f79535-47bb-0310-9956-ffa450edef68
2001-01-05 20:44:44 +00:00
Ryan Bloom
83c2b3f96b Stop copying file names that we get from apr_file_t's and apr_dir_t's.
We copy the data when we store it in the structures, we can just return
a pointer from there, and use const data.  This puts the onus back on
Apache to copy the data if it needs to modify it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87592 13f79535-47bb-0310-9956-ffa450edef68
2001-01-05 19:40:05 +00:00
David Reid
214ce806b6 Add a needed header file. This is another of the patches I've had for
a while but forgot to commit... Doh!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87591 13f79535-47bb-0310-9956-ffa450edef68
2001-01-05 16:38:24 +00:00
David Reid
d5a0dc99af As we now use pools in the logging of the failure to get a hostname,
use ap_log_perror() as per Brians suggestion.

Submitted by:	Brian Havard <brianh@kheldar.apana.org.au>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87590 13f79535-47bb-0310-9956-ffa450edef68
2001-01-05 14:32:31 +00:00
David Reid
76090d0bed This stops a segfault on my machine where I haven't got a hostname for
the function to find.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87586 13f79535-47bb-0310-9956-ffa450edef68
2001-01-04 21:53:27 +00:00
Jeff Trawick
a65b522fb9 Set up stderr logging explictly early in initialization so that a pool is
available for creating the APR representation of stderr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87583 13f79535-47bb-0310-9956-ffa450edef68
2001-01-04 18:22:50 +00:00
Ben Laurie
19519dff8a Generic hooks (and a demo content filter module).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87568 13f79535-47bb-0310-9956-ffa450edef68
2001-01-02 17:41:38 +00:00
Ryan Bloom
db280eb3a5 Simplify the lingering close logic a bit. Doesn't actually change
anything, this just removes a duplicate call to ap_flush_conn.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87567 13f79535-47bb-0310-9956-ffa450edef68
2001-01-02 17:12:09 +00:00
Ryan Bloom
bc1891795e Modify a couple of calls to ap_log_error with a NULL server to use
ap_log_perror, and pass a pool.  The keeps us from seg faulting if the
error log hasn't been opened yet.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87565 13f79535-47bb-0310-9956-ffa450edef68
2001-01-02 01:34:05 +00:00
Ryan Bloom
821dee4c85 Remove AP_USE_MMAP_FILES, it doesn't really control anything anymore. Now
we just use APR_HAS_MMAP directly, just like APR-util does.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87564 13f79535-47bb-0310-9956-ffa450edef68
2001-01-01 00:36:46 +00:00
Ryan Bloom
703d13f7c5 When we are starting the server, we have a pool that can be used to open
the error log.  Rather than try to log a regular error, log an error with
the pool that we have, so that we can open stderr successfully.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87562 13f79535-47bb-0310-9956-ffa450edef68
2001-01-01 00:13:41 +00:00
Ryan Bloom
2af4c27d36 We have a pool in this function, and log_error_core needs a pool in order
to open stderr successfully.  By using ap_log_perror, we can pass a valid
pool down to log_error_core


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87561 13f79535-47bb-0310-9956-ffa450edef68
2000-12-31 23:41:07 +00:00
Ryan Bloom
e417013fbc Use a real pool to dup the error log file descriptor.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87560 13f79535-47bb-0310-9956-ffa450edef68
2000-12-31 19:19:07 +00:00
Ben Laurie
1ca170d01b RM was not defined. Just use rm instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87559 13f79535-47bb-0310-9956-ffa450edef68
2000-12-31 11:35:50 +00:00
Jeff Trawick
4b9d80ed8c ap_save_brigade() can fail, so report what happened via an apr_status_t
return code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87548 13f79535-47bb-0310-9956-ffa450edef68
2000-12-29 13:56:30 +00:00
Greg Stein
0b34a61a47 be gone, fool!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87508 13f79535-47bb-0310-9956-ffa450edef68
2000-12-22 12:02:43 +00:00
William A. Rowe Jr
67ae4c25f3 More Win32 Goodness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87497 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 19:51:06 +00:00
William A. Rowe Jr
b9f233dec3 Allow the server to run in the bin/ subdirectory, and back up over the
bin/ directory when determining the Win32 ServerRoot.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87495 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 16:25:44 +00:00
William A. Rowe Jr
c876e8476a Out of the sandbox and into prime time. Note... these should always and
only be regenerated immediately prior to the tag and roll.  Do not assume
  they are current with the sources in the development tree.  They should
  be generated as vc5 make files, since only vc5 makefiles are readable by
  both vc5 and vc6.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87479 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:46:22 +00:00
William A. Rowe Jr
0a37cdf9fe Correction, commited the vc5. Need vc6 in the tree. Humble appologies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87475 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:25:10 +00:00
William A. Rowe Jr
4315b0c706 The Win32 overhaul, in summary;
Modules are named mod_foo.so
    Dynamic Libraries are named libfoo.dll, and are stored in bin/
    The former ApacheCoreDll is now libhttpd.dll
    Apache.exe moves to bin/
    The make install now copies include, lib, and libexec
    All build options are normalized, filenames adjusted appropriately


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87471 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:04:49 +00:00
Jeff Trawick
351725e726 Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87460 13f79535-47bb-0310-9956-ffa450edef68
2000-12-20 16:44:01 +00:00
Greg Stein
05de3e2fca exports.c was dependent upon delete-exports, but that dependency will always
fail since there is no delete-exports file (thus, exports.c would always get
regenerated, recompiled, and relinked). Instead, we move the delete-exports
target "up" to the "all" target. However, ltlib.mk doesn't allow us to add
things to the "all" target, so we also revise the set of .mk files to use.

also use TARGET_EXPORTS consistently.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87449 13f79535-47bb-0310-9956-ffa450edef68
2000-12-20 10:19:06 +00:00
William A. Rowe Jr
aa06aa0f89 Round out the Win32 build. Changes include:
ApacheModuleProxy.dsp moved to os/win32 with the rest of them
      (yes, all could move the their respective folders, this was the
       path of least resistance.)
    All compilation and linkage tags are identical, no incremental tags
      CPP /Gm removed, /incremental:no consistently applied, and the
      exception handling /GX was removed from release builds.
    Every lib builds to LibD/LibR directories.  Every executable and
      dynamic module builds to Debug/Release directories.  /Fd"name" tags
      force .pdb/.idb files to be named as the project, rather than VC##.
    Assure the build works correctly, and is similar to the normal style.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87432 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 23:22:06 +00:00
Ryan Bloom
98a20231fc ap_start_shutdown is not used by anybody outside of the MPMs, so we don't
need to put it in the ap_mpm.h header file.  This also makes all of the
instances of ap_start_shutdown static.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87428 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 20:44:24 +00:00
Ryan Bloom
c2141cda9e Correct a mistake in the delete-exports target
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87425 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 17:52:40 +00:00
Ryan Bloom
b5440c348a Force all Apache functions to be linked into the executable, whether they
are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87424 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 17:05:48 +00:00
Jeff Trawick
b22291af26 Rework the RFC1413 handling to make it thread-safe, use a timeout
on the query, and remove IPv4 dependencies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87423 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 16:08:03 +00:00
Ryan Bloom
337464ae2f Get the perchild MPM working better again. I have been able to pass
some file descriptors back and forth and serve requests, but this code is
still very experimental.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87415 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 01:59:54 +00:00