1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

544 Commits

Author SHA1 Message Date
William A. Rowe Jr
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 05:33:44 +00:00
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 00:12:39 +00:00
Jeff Trawick
f8e41a4112 mod_cgid: Catch configuration problem where two web server instances
share same ServerRoot but admin forgot to use ScriptSock.

reviewed by: nd, stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106408 13f79535-47bb-0310-9956-ffa450edef68
2004-11-24 11:24:32 +00:00
Joe Orton
a4063b9fba * modules/generators/mod_cgi.c (cgi_handler): Ensure all stderr from
the script is logged if it generated a non-local redirect.

PR: 20111


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106195 13f79535-47bb-0310-9956-ffa450edef68
2004-11-22 16:03:20 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
Joe Orton
65153a5687 * modules/generators/mod_cgid.c (cgid_init): Fix GCC strict-aliasing
warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105753 13f79535-47bb-0310-9956-ffa450edef68
2004-11-12 10:16:01 +00:00
Joe Orton
c48cfec2fd * server/util_filter.c (ap_save_brigade): Handle an ENOTIMPL setaside
function correctly.

* modules/generators/mod_cgi.c (cgi_handler): Revert r1.169,
unnecessary CGI bucket lifetime kludge.

PR: 31247


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105297 13f79535-47bb-0310-9956-ffa450edef68
2004-09-26 15:52:51 +00:00
Joe Orton
c69b0be29f * modules/generators/mod_cgi.c (cgi_handler): Fix possible segfaults
in CGI bucket methods if invoked from a subrequest.

PR: 31247


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105250 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 15:38:02 +00:00
Paul Querna
7efbc41588 mod_info: Added all Standard Hooks to the Hook Listing.
mod_info now has two sections, 'Startup Hooks' and 'Request Hooks'.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105001 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 07:19:08 +00:00
Paul Querna
29f9e866fa fix XHTML 1.0 Validation Errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105000 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 06:35:32 +00:00
Paul Querna
e4a3bcb852 mod_info: Added ?hooks. Now outputs XHTML. Added more build info.
updated mod_info docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104999 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 05:48:32 +00:00
Paul Querna
f8300b56ba Remove the use of sprintf.
Cleanup the history parts at the top of mod_info.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104981 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 02:11:16 +00:00
Paul Querna
d201a7a592 No Functional Changes to mod_info.
This is purely a style cleanup for mod_info.

I plan on making more functional changes later.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104980 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 01:43:03 +00:00
Paul Querna
79c39b3a9b Rewrote config tree walk using recursion the way God intended.
Added ?config option. Added printout of config filename and line numbers.

PR: 30919
Submitted by: Rici Lake <rici ricilake.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104942 13f79535-47bb-0310-9956-ffa450edef68
2004-09-03 02:31:06 +00:00
Joshua Slive
0a6ff84521 "Rule" is pretty abstract in this case and seems to
cause confusion for many people.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104935 13f79535-47bb-0310-9956-ffa450edef68
2004-09-02 14:53:28 +00:00
André Malo
a97ed90edf #ifndef AP_UNSAFE_ERROR_LOG_UNESCAPED the stderr to errorlog stuff
for those who don't want to escape (as in server/log.c)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104834 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 20:50:55 +00:00
Bill Stoddard
e0c3bc4dcb Escape bytes returned by the errfn because it might be from an untrusted source
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104780 13f79535-47bb-0310-9956-ffa450edef68
2004-08-24 01:49:59 +00:00
Justin Erenkrantz
022f0af97c Remove deprecated APR_STATUS_IS_SUCCESS() macro in favor of direct test against
APR_SUCCESS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104439 13f79535-47bb-0310-9956-ffa450edef68
2004-08-01 01:12:30 +00:00
Jean-Jacques Clar
227df09ee4 rev back to previous version, removing chnges to overload detach field , putting back addrspace field
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104251 13f79535-47bb-0310-9956-ffa450edef68
2004-07-12 16:53:24 +00:00
Paul Querna
e8637daae8 Add ShowForbidden to IndexOptions to list files
that are not shown because the subrequest returned 401 or 403.

PR: 10575


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104212 13f79535-47bb-0310-9956-ffa450edef68
2004-07-10 02:25:56 +00:00
Jean-Jacques Clar
f2e3f86232 Overloading detached field in cgi_exec_info_t stuct in order to use same field to set detached and addrspace values for proc to be started.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104209 13f79535-47bb-0310-9956-ffa450edef68
2004-07-09 20:28:48 +00:00
Martin Kraemer
1577a9adf6 Let CGI daemon die if the network layer has been shut down (problem noticed on BS2000/OSD)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104080 13f79535-47bb-0310-9956-ffa450edef68
2004-06-29 13:48:20 +00:00
Joe Orton
25c9f93504 * modules/generators/mod_status.c: Mark private global variables
as static.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104029 13f79535-47bb-0310-9956-ffa450edef68
2004-06-24 11:25:18 +00:00
Jean-Jacques Clar
136ee08033 Added new field in apr_procattr_t and cgi_exec_info_t structures to support loading in current or new address space (NetWare ONLY).
Replaced changes that added APR_PROGRAM_ADDRSPACE committed 6/11/04.
Reviewed by Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103946 13f79535-47bb-0310-9956-ffa450edef68
2004-06-14 17:28:25 +00:00
Joe Orton
0df6a7dbfe * modules/generators/mod_cgi.c (cgi_handler): Soak up stderr from nph-
scripts correctly.

PR: 18348
Submitted by: Jeff Trawick (in mod_jcgi)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103622 13f79535-47bb-0310-9956-ffa450edef68
2004-05-05 15:30:53 +00:00
Joe Orton
46fb957d01 * modules/generators/mod_cgi.c (cgi_handler): Combine common code
between nph and non-nph handling; use a CGI bucket for both cases if
APR_FILES_AS_SOCKETS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103621 13f79535-47bb-0310-9956-ffa450edef68
2004-05-05 14:52:44 +00:00
Joe Orton
d4cb879b8f Implement the "CGI bucket" in mod_cgi to handle stderr output during
script execution, preventing deadlock if stderr output fills the pipe
buffer:

* modules/generators/mod_cgi.c (log_script_err): Return a read error.
(cgi_bucket_create, cgi_bucket_dup, cgi_read_stdout, cgi_bucket_read):
New functions.
(cgi_handler): Use new CGI bucket rather than a pipe bucket if
APR_FILES_AS_SOCKETS; use zero read timeout from stdout/stderr during
script execution.

PR: 22030
Submitted by: Joe Orton, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103437 13f79535-47bb-0310-9956-ffa450edef68
2004-04-18 16:02:57 +00:00
Joe Orton
ef03042845 * modules/generators/mod_cgid.c (cgid_server, set_script_socket):
Remove unused variables.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103209 13f79535-47bb-0310-9956-ffa450edef68
2004-03-30 10:57:30 +00:00
Jeff Trawick
8fcedf0718 mod_cgid: Don't allow Scriptsock to be specified inside VirtualHost;
Don't place script socket inside default server root instead of
actual server root.

The sock name was being stored in the server config, though it
was not specific to a server.

ap_server_root_relative() was being used prior to config processing,
so it was always picking up the default server root.

PR:            27886


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103184 13f79535-47bb-0310-9956-ffa450edef68
2004-03-29 02:56:21 +00:00
Jeff Trawick
18edbaaf56 mod_cgid: Fix storage corruption caused by use of incorrect pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102961 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 20:00:13 +00:00
Joe Orton
7d90e82bac * modules/standard/mod_autoindex.c (index_directory): If stat() fails
for a particular dirent, ignore that entry rather than truncating the
directory listing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102924 13f79535-47bb-0310-9956-ffa450edef68
2004-03-10 20:51:10 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
d0e05bada9 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102565 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:07:22 +00:00
André Malo
0d57db3af2 apply Apache License, 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102524 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:19:28 +00:00
Joe Orton
c4aa600023 Use -export-dynamic only when linking an httpd which includes mod_so,
not when linking modules or support programs.

* modules/aaa/config.m4, modules/arch/win32/config.m4,
modules/cache/config.m4, modules/echo/config.m4,
modules/filters/config.m4, modules/generators/config5.m4,
modules/metadata/config.m4: Don't add -export-dynamic to LT_LDFLAGS.

* modules/mappers/config9.m4: Add -export-dynamic to HTTPD_LDFLAGS
when mod_so is enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102235 13f79535-47bb-0310-9956-ffa450edef68
2004-01-08 20:47:29 +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
Jeff Trawick
8dfff0a318 change the way the cgid daemon restart logic determines whether
or not the MPM is still running...   now it works with prefork
MPM too


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102046 13f79535-47bb-0310-9956-ffa450edef68
2003-12-13 19:09:00 +00:00
André Malo
416e669813 add another space, for the sake of Netscape 4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101854 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 17:27:30 +00:00
André Malo
fcab969a38 restore the space which broke all tests :-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101853 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 17:20:55 +00:00
Ian Holsman
b8f83d01ae mod_autoindex: new directive IndexStyleSheet
PR:
Obtained from:
Submitted by: Tyler Riddle <triddle_1999 yahoo.com> and Paul Querna <chip force-elite.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101809 13f79535-47bb-0310-9956-ffa450edef68
2003-11-20 03:45:22 +00:00
Cliff Woolley
aaf0424e2b get rid of _FOREACH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101788 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 02:09:14 +00:00
Jeff Trawick
c76efd6bfb Fix a long delay with CGI requests and keepalive connections on
AIX.

On AIX, for processes like mod_cgid's script children where
SIGCHLD is ignored, kill(pid,0) returns success for up to
one second after the script child exits, based on when a
daemon runs to clean up unnecessary process table entries.
getpgid() can report the proper info (-1/ESRCH) immediately.

One user had a page with a lot of embedded images created by
CGIs, and the browser fetched them on a keepalive connection,
and the cumulative delays were very noticeable by the clients.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101716 13f79535-47bb-0310-9956-ffa450edef68
2003-11-07 15:26:34 +00:00
André Malo
256c57f350 darn, the patch for bug 9587 (wrong icon for directories shown) broke
the directory descriptions more or less completely. Fix it now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101693 13f79535-47bb-0310-9956-ffa450edef68
2003-11-03 21:57:51 +00:00
André Malo
1694aa9b06 - add XHTML doctypes to httpd.h
- fix the (x)html output of mod_autoindex to be consistent
  and make it configurable to emit either HTML or XHTML

PR: 23747


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101683 13f79535-47bb-0310-9956-ffa450edef68
2003-11-02 20:37:04 +00:00
André Malo
72ff650b79 Don't omit the initial <tr> if SuppressIcon is set.
Submitted by: Jesse Tie-Ten-Quee <highos@highos.com>
PR: 21668


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101661 13f79535-47bb-0310-9956-ffa450edef68
2003-11-01 23:00:25 +00:00
André Malo
4c3949e8b9 improve readability a (little) bit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101657 13f79535-47bb-0310-9956-ffa450edef68
2003-11-01 22:06:28 +00:00
Thom May
63abfc7538 * modules/generators/mod_info.c:
(mod_info_module_cmds) ap_escape_html() all directives and
        arguments.
PR: 24232


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101626 13f79535-47bb-0310-9956-ffa450edef68
2003-10-30 16:43:45 +00:00
Jeff Trawick
468254b6b0 mod_status: Report total CPU time accurately when using a threaded
MPM.

Note: It worked before with linuxthreads and it still does.  But now
it works with normal thread implementations too.

PR:     23795


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101614 13f79535-47bb-0310-9956-ffa450edef68
2003-10-29 20:56:28 +00:00
Sander Striker
3e4547ab87 Forward port from 2.0:
SECURITY [CAN-2003-0789]: mod_cgid: Resolve some mishandling of
the AF_UNIX socket used to communicate with the cgid daemon and
the CGI script.

Submitted by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101570 13f79535-47bb-0310-9956-ffa450edef68
2003-10-26 23:25:44 +00:00
Jeff Trawick
be1143ae61 mod_cgid: fix a hash table corruption problem which could
result in the wrong script being cleaned up at the end of a
request.

Unique storage was not used for the key, as the code assumed
incorrectly that apr_hash_set() made a copy of the key.  Thus,
when the script pid was looked up at the end of the request,
some other script's pid could be found.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101374 13f79535-47bb-0310-9956-ffa450edef68
2003-10-02 11:58:57 +00:00