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

192 Commits

Author SHA1 Message Date
William A. Rowe Jr
40655f8641 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
Jeff Trawick
78dc9b739f fix a warning on platforms where <strings.h> is needed for str[n]casecmp()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87693 13f79535-47bb-0310-9956-ffa450edef68
2001-01-15 20:23:12 +00:00
Ryan Bloom
c33b25a3dd Remove a couple more NULL handler specifications.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87662 13f79535-47bb-0310-9956-ffa450edef68
2001-01-12 01:08:22 +00:00
Jeff Trawick
83b77a0d64 only handle the request if server-info is the handler
Submitted by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87645 13f79535-47bb-0310-9956-ffa450edef68
2001-01-10 19:23:25 +00:00
Jeff Trawick
24588fe387 get mod_info working again (mostly)
(I guess I should simply zap the code to list the handlers
for each module?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87642 13f79535-47bb-0310-9956-ffa450edef68
2001-01-10 17:31:04 +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
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
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
Jeff Trawick
b3ec25393c mod_cgi: Fix some problems where the wrong error value was being traced
(errno instead of apr_status).

mod_cgid: Keep some of the code in synch with the version in mod_cgi.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87576 13f79535-47bb-0310-9956-ffa450edef68
2001-01-03 20:03:48 +00:00
Ryan Bloom
3c4d977fbe Change a bunch of mallocs in mod_cgid to apr_palloc. These were never
getting freed, and using malloc.  This was safe, because we were in
the CGID process, but pools are just safer here.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87569 13f79535-47bb-0310-9956-ffa450edef68
2001-01-02 17:57:42 +00:00
Ryan Bloom
7808798c48 On Unix, we do not want to use an absolute path for CGI scripts. SuEXEC
will not let us use one, and when not using SuEXEC, we chdir() into the
correct directory.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87537 13f79535-47bb-0310-9956-ffa450edef68
2000-12-27 23:30:07 +00:00
Ryan Bloom
0ef67c93b0 Move the config.m4 file to config5.m4 in the generators directory so that
we can actually make the cgi module decision based on MPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87527 13f79535-47bb-0310-9956-ffa450edef68
2000-12-26 22:46:09 +00:00
Ryan Bloom
672c91791d Get mod_cgid to use apr calls for creating the actual CGI process.
This also allows mod_cgid to use ap_os_create_priviledged_process,
thus allowing for SuExec execution from mod_cgid.  Currently, we do
not support everything that standard SuExec supports, but at least
it works minimally now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87524 13f79535-47bb-0310-9956-ffa450edef68
2000-12-23 07:09:01 +00:00
William A. Rowe Jr
8a5e3208d9 Last of the Win32 goodness I've noticed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87503 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 21:07:18 +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
Ryan Bloom
40eae41078 Rename the apr_opendir symbol to apr_dir_open. This makes more sense,
and the rename was proposed a while ago inside of APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87385 13f79535-47bb-0310-9956-ffa450edef68
2000-12-17 03:35:39 +00:00
Allan K. Edwards
73c6ea589f Get exe CGI's working again on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87359 13f79535-47bb-0310-9956-ffa450edef68
2000-12-15 15:02:38 +00:00
Jeff Trawick
05be6a6716 Straighten up the first-time-through check in mod_cgid and add a CHANGES
entry for the bug fixes to mod_rewrite and mod_cgid.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87330 13f79535-47bb-0310-9956-ffa450edef68
2000-12-13 13:30:40 +00:00
Jeff Trawick
64bb50e427 Get mod_cgid to work as a DSO by changing the way it
keeps track of whether or not its post config hook has
been called before.  Instead of a static variable (which
is replaced when the DSO is loaded a second time), use
userdata in the process pool.

Still to go: mod_file_cache, mod_rewrite


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87321 13f79535-47bb-0310-9956-ffa450edef68
2000-12-13 04:03:19 +00:00
Jeff Trawick
a3d09c32f7 Change a couple of socket call failures from 404 errors to
500 errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87305 13f79535-47bb-0310-9956-ffa450edef68
2000-12-12 20:34:20 +00:00
Jeff Trawick
ca4c6afa60 Fix a comparison with ENOENT which was accidently broken during
the canonical error cleanup.

We wish to avoid reporting the boring error where we try to unlink
a socket which doesn't already exist.  We only want to report
interesting stuff.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87298 13f79535-47bb-0310-9956-ffa450edef68
2000-12-12 12:01:38 +00:00
Greg Stein
9787943f19 *) remove STANDARD_LIBS line; it is unused/unneeded
*) simplify by removing the extra AC_DEFUN() in each file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87247 13f79535-47bb-0310-9956-ffa450edef68
2000-12-07 10:40:01 +00:00
Ryan Bloom
093d36130b Add cgi and cgid back into the configuration system.
Submitted by:	Paul J. Reder <rederpj@raleigh.ibm.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87237 13f79535-47bb-0310-9956-ffa450edef68
2000-12-06 18:41:05 +00:00
William A. Rowe Jr
bf57cf0335 The -big- fix, all the proper linkages for BaseAddr.ref plus a bit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87221 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 20:36:03 +00:00
William A. Rowe Jr
56560e4293 A bit of inclusion for the apr-util package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87213 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 17:38:40 +00:00
William A. Rowe Jr
f119cafbaa This patch illustrates the new locations, and makes the majority of the
adjustments.  Now to actually try to build the thing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87212 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 16:37:50 +00:00
Ryan Bloom
c512685df5 Ignore all the files that are generated during a build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87195 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 03:48:26 +00:00
Ryan Bloom
d412995055 Get the modules configuration stuff working correctly. This just deals
with STANDARD modules and Protocol, not MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87186 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 21:38:51 +00:00
Ryan Bloom
a87a761b37 Start to add back the config.m4 and Makefile.in's that were separated out
during the repository move.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87184 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 20:34:48 +00:00
Jeff Trawick
5c1d33b606 Fix a segfault in mod_info. mod_info_module_cmds() had a misstep when
reaching the end of the configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87128 13f79535-47bb-0310-9956-ffa450edef68
2000-11-29 15:16:54 +00:00
Greg Stein
e980d3f135 *) sprinkle a little magic "const" dust around (specifically, to compensate
for the prototype change to ap_os_create_privileged_process())
*) wrap some long lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87095 13f79535-47bb-0310-9956-ffa450edef68
2000-11-27 22:30:34 +00:00
Greg Stein
ead2dae94c *) Compensate for recent changes in the APR headers. Specifically, some
files need to specifically include stdio.h, or a particular apr_*.h
   header.

*) Adjust callers of apr_create_process() to deal with the extra "const"

*) Add "const" to args of ap_os_create_privileged_process()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87080 13f79535-47bb-0310-9956-ffa450edef68
2000-11-26 04:47:43 +00:00
Ryan Bloom
02f60b7ea4 Allow modules to specify the first module for a sub-request. This allows
modules to not have to muck with the output_filter after it creates the
sub-request.  Without this change, modules that create a sub-request have
to manually edit the output_filters, and therefore skip the sub-request
output_filter.  If they skip the sub-request output_filter, then we end
up sending multiple EOS buckets to the core_output_filter.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87065 13f79535-47bb-0310-9956-ffa450edef68
2000-11-22 19:38:07 +00:00
William A. Rowe Jr
4bdc763772 Cleanup more compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87010 13f79535-47bb-0310-9956-ffa450edef68
2000-11-18 15:12:47 +00:00
Ryan Bloom
b62a882802 Port mod_info to 2.0. This is basically a complete re-write to use the
config tree instead of re-reading the config file.  As a part of this
change, the config tree needs to be exposed to modules as ap_conftree.
Submitted by:	Ryan Morgan <rmorgan@covalent.net>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86948 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 01:55:26 +00:00
Jeff Trawick
85815fec74 Clean up some of the warnings from a Tru64 build, mostly due to
the recent apr_ssize_t->apr_size_t changes.  The problem in mod_cgid
was an int function which didn't have a return statement.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86934 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 03:50:16 +00:00
Ryan Bloom
50758ecf68 Fix a lot of the fallback from the apr_ssize_t to apr_size_t change
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86915 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 19:01:33 +00:00
William A. Rowe Jr
e86a47d9a0 Two patches (sorry), first to clean up the double assignment of the
r->content_type value on UNICODE_FS, and the second to add ETag and
  Modified-Date to the file listing.  If anyone sees an objection to
  this thing, please scream (loudly) before I go and attack 1.3.x with
  the ETag/Modified-Date Friday a.m.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86803 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 20:01:52 +00:00
Ryan Bloom
e4fe63f3df Make mod_cgi and mod_include work when compiled as DSO's again. This is
accomplished by moving suexec out of it's own file and into unixd.[ch].
The problem was that suexec.c wasn't being linked into the server unless
a module was actually using ap_os_create_process.  This is still not clean,
but it works now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86772 13f79535-47bb-0310-9956-ffa450edef68
2000-10-31 00:47:24 +00:00
Ryan Bloom
1db4cfe425 Fix a const problem.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86766 13f79535-47bb-0310-9956-ffa450edef68
2000-10-30 19:30:55 +00:00
William A. Rowe Jr
5c59c9a5b1 Ok here it is: Win32 utf-8 native unicode filename support.
There are just too many folks to credit... so this goes out from
  the entire ApacheCon hacking team :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86740 13f79535-47bb-0310-9956-ffa450edef68
2000-10-25 02:46:40 +00:00
William A. Rowe Jr
8e5cf24494 Fix foobar
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86720 13f79535-47bb-0310-9956-ffa450edef68
2000-10-23 19:02:41 +00:00
Manoj Kasichainula
b1fb90877e Add back suexec support.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86712 13f79535-47bb-0310-9956-ffa450edef68
2000-10-23 15:30:57 +00:00
William A. Rowe Jr
d6490633eb Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols
for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper)
  and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE.
  All _VAR_ flavors changes to _DATA to be absolutely clear.
  Thank you Greg, for the most obvious suggestion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86609 13f79535-47bb-0310-9956-ffa450edef68
2000-10-16 06:05:15 +00:00
William A. Rowe Jr
0c6f3b11ce Document more bad Win32 behavior... if the url isn't .exe, then don't
throw an .exe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86606 13f79535-47bb-0310-9956-ffa450edef68
2000-10-16 03:37:20 +00:00
Jeff Trawick
2f6f8a66fd mod_cgid: In the handler, shut down the Unix socket (only for write)
once we finish writing the request body to the cgi child process;
otherwise, the client doesn't hit EOF on stdin.  Small request bodies
worked without this change (for reasons I don't understand), but large
ones didn't.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86574 13f79535-47bb-0310-9956-ffa450edef68
2000-10-13 03:38:35 +00:00
Ryan Bloom
999d08b62b These BUFFs aren't used anymore, so they should be removed from the
cgid module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86558 13f79535-47bb-0310-9956-ffa450edef68
2000-10-12 04:12:52 +00:00
William A. Rowe Jr
eaba82f661 Regardless of reaction to a symbol rename -within- the sources, these
external symbols change for clarity.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86540 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 17:20:12 +00:00