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

280 Commits

Author SHA1 Message Date
Stefan Fritsch
ae843193ea Only dump User/Group if DUMP_RUN_CFG is defined
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180719 13f79535-47bb-0310-9956-ffa450edef68
2011-10-09 21:30:20 +00:00
Stefan Fritsch
0ddfb3e6cc Add -D DUMP_RUN_CFG option to dump some configuration items
from the parsed (or default) config. This is useful for init scripts that
need to setup temporary directories and permissions, for example if those
temporary directories are located on a ram disk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180681 13f79535-47bb-0310-9956-ffa450edef68
2011-10-09 18:35:23 +00:00
Stefan Fritsch
1951a037bf More cleanup: Expand tabs and some more indentation fixes
No functional change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 18:08:42 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Jim Jagielski
103f776c25 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:38:09 +00:00
Stefan Fritsch
481fac5ce2 Make the SERVER_NAME variable include [ ] for literal IPv6 addresses, as
mandated by RFC 3875

PR: 26005


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147614 13f79535-47bb-0310-9956-ffa450edef68
2011-07-17 13:56:28 +00:00
Stefan Fritsch
beb3ea9c11 Add more (trace) logging to the ap_scan_script_header*() functions
Add ap_scan_script_header*_ex() functions that take a module index for
logging.
Make mod_cgi, mod_cgid, mod_proxy_fcgi, mod_proxy_scgi, mod_isapi use the
new functions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147493 13f79535-47bb-0310-9956-ffa450edef68
2011-07-16 21:53:18 +00:00
Guenter Knauf
8def8313ec Invert logic for env var utf-8 fixing.
Now we exclude a list of vars which we know for sure they
dont hold utf-8 chars; all other vars will be fixed. This
has the benefit that now also all vars from 3rd-party
modules will be fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146932 13f79535-47bb-0310-9956-ffa450edef68
2011-07-15 00:28:39 +00:00
Guenter Knauf
6b72d583d1 Fixed some more env vars which make problems.
This fix is based on BZ 13029 / 34985, and includes
now the SSL_ and GEOIP_ vars; otherwise its impossible
to run CGIs when mod_ssl and/or mod_geoip are loaded
and those mods return UTF-8 chars in any var during a
request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1145647 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 16:13:28 +00:00
Stefan Fritsch
67dd4b3f9c Fix a few warnings about use of uninitialized values.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1143193 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 20:24:33 +00:00
Stefan Fritsch
f66af00c19 Avoid some memory allocations by using apr_table_setn where the string
arguments are const.

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 51357


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135083 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 10:58:10 +00:00
Guenter Knauf
1f6d272850 Fixed sysinclude; removed trailing 0; fixed indent.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1088838 13f79535-47bb-0310-9956-ffa450edef68
2011-04-05 01:01:16 +00:00
Jeff Trawick
4598f1a7d4 fix some grammar mistakes, mostly in comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-12 00:35:39 +00:00
Guenter Knauf
abcb9e3011 Axed C++ comments and tabs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1074809 13f79535-47bb-0310-9956-ffa450edef68
2011-02-26 09:34:47 +00:00
Guenter Knauf
8753d7e167 Added shebang check so that .vbs scripts can work as CGI.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1054347 13f79535-47bb-0310-9956-ffa450edef68
2011-01-02 04:33:28 +00:00
Guenter Knauf
dbf4a86e3d Fixed some win32 types.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040220 13f79535-47bb-0310-9956-ffa450edef68
2010-11-29 18:33:28 +00:00
Jeff Trawick
d4d90bdf0a suEXEC: Add Suexec directive to disable suEXEC without renaming the
binary (Suexec Off), or force startup failure if suEXEC is required
but not supported (Suexec On).  Change SuexecUserGroup to fail 
startup instead of just printing a warning if suEXEC is disabled.

Additionally, ap_unixd_config.suexec_disabled_reason has a message,
suitable for logging/messaging, explaining why the feature isn't
available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033519 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 15:34:43 +00:00
Daniel Earl Poirier
6b803976f2 Fix a number of typos and misspellings. Reported by Ville Skytta.
PR48496.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029134 13f79535-47bb-0310-9956-ffa450edef68
2010-10-30 17:56:13 +00:00
Guenter Knauf
973eb55182 Added require prototypes conditionally to CFLAGS for NETWare;
added header includes for getting protos.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@991588 13f79535-47bb-0310-9956-ffa450edef68
2010-09-01 16:17:23 +00:00
Stefan Fritsch
aa576071af - Remove a load of unused variables (or variables that are set but never read).
- Move some declarations into the correct #ifdef scope.

I couldn't compile/test netware, but the changes look obvious enough.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@982016 13f79535-47bb-0310-9956-ffa450edef68
2010-08-03 19:45:21 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
William A. Rowe Jr
8e5e0e8085 Prevent future developers from being as easily confused; prefix the
registered callback function names with regfnXxx.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@919543 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 19:09:46 +00:00
Jeff Trawick
323d05a480 revert r918671; these four functions don't need to be
addressible except via the function pointers in the
EXTENSION_CONTROL_BLOCK


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@919531 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 18:30:20 +00:00
Jeff Trawick
bb70f0e3b9 follow up to r918665:
These particular functions can't be static because they're 
part of ISAPI, so use a different mechanism to quiet the gcc 
warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@918671 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 20:10:26 +00:00
Jeff Trawick
bdcc35c8f3 fix these warnings:
mod_isapi.c:488: warning: no previous prototype for ‘GetServerVariable’
mod_isapi.c:590: warning: no previous prototype for ‘ReadClient’
mod_isapi.c:807: warning: no previous prototype for ‘WriteClient’
mod_isapi.c:863: warning: no previous prototype for ‘ServerSupportFunction’
mod_isapi.c:1407: warning: no previous prototype for ‘isapi_handler’



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@918665 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 19:49:41 +00:00
William A. Rowe Jr
1ea89a333a SECURITY: CVE-2010-0425 (cve.mitre.org)
mod_isapi: Do not unload an isapi .dll module until the request
processing is completed, avoiding orphaned callback pointers.

Submitted by: Brett Gervasoni <brettg senseofsecurity.com>, trawick
Reviewed by: trawick, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@917870 13f79535-47bb-0310-9956-ffa450edef68
2010-03-02 04:30:33 +00:00
Jeff Trawick
33e15a38e8 more configure-time support for dynamically loadable MPMs:
. axe --with-mpm="shared" hack, replace with --enable-mpms-shared={all|list}
. replace singular MPM_NAME with access to the list of enabled MPMs
. replace singular MPM_SUBDIR with list MPM_SUBDIRS
. enable OS/2 MPM in same manner as others with configure support instead of
  hard-coding in configure.in

Current state: MPMs are built as static archives (but not linked to httpd) with
--enable-mpms-shared, so they still have to be built with apxs to load 
dynamically.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832228 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 00:38:06 +00:00
Guenter Knauf
35e256eed7 removed now obsolete export defines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830767 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 21:21:02 +00:00
William A. Rowe Jr
96c72f1063 Treat gid's identically to uid's for purposes of numeric formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@816388 13f79535-47bb-0310-9956-ffa450edef68
2009-09-17 21:35:04 +00:00
William A. Rowe Jr
5181635ab3 Always make mod_*.h files available where they exist, modpath by modpath
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808722 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 01:27:46 +00:00
Brian Havard
60fbe11de1 Bring back OS/2 support.
Reverses r758929 with a little bit of conflict resolution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 08:56:13 +00:00
Nick Kew
777f02ed58 Correctly set suexec_enabled when httpd is run by non-root
PR 42175


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791337 13f79535-47bb-0310-9956-ffa450edef68
2009-07-05 23:10:30 +00:00
Rainer Jung
10f788c851 - use apr_strerror() instead of strerror()
- log errno via param when using ap_log_*


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773968 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 16:30:55 +00:00
Nick Kew
9c47ca1438 Whoops! cleanup r771144, which had some local/dev stuff left in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771145 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 23:04:02 +00:00
Nick Kew
40361e60f3 mod_privileges: introduce PrivilegesMode: fast mode as before vs secure
mode to fork an unprivileged child per-request in the manner of MPM-ITK
anwhere there's a risk of running malicious code.
Documentation to follow.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771144 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 23:02:35 +00:00
Jeff Trawick
a1908585a8 Core can specify a platform-specific rewrite args hook. Use that on Unix.
Windows continues to specify this in the MPM, at least until someone
can separate out the MPM-specific bits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759699 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:41:02 +00:00
Jeff Trawick
301f0404f5 axe unmaintained 1.3-era code to support AUX, SunOS, IRIX, Next, Tandem, MPE,
LynxOS, QNX, and UnixWare


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758944 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 00:32:22 +00:00
Jeff Trawick
cb8a82faed remove TPF support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758936 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 00:05:18 +00:00
Jeff Trawick
ee32468a33 remove OS/2 platform support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758929 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:47:52 +00:00
Jeff Trawick
c7266edf61 The rewrite-args hook isn't available to MPM DSOs. Piggy-back on the
linked-in mod_unixd.c to handle that.

(The set of MPMs modified is the same set for which mod_unixd is enabled,
which is approximately equivalent to the set of Unix MPMs which anybody has
tried to maintain in recent memory.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758278 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 14:50:24 +00:00
Jeff Trawick
7720a70dc4 axe the remaining checks of AP_MPM_WANT_foo to see what code to generate
MPMs no longer provide those definitions

(the signal server support is an interesting problem, since it has to be known before loading
loading the MPM)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758014 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 20:52:10 +00:00
Jeff Trawick
076514f3ac Allow building httpd without a built-in MPM by specifying
--with-mpm=shared

on configure.  When built thusly, an MPM should be loaded via LoadModule.

(Currently you need to build the MPM with apxs.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757999 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 20:23:42 +00:00
Roy T. Fielding
736d659de0 use a local module header file to store the function prototype
for ap_unixd_setup_child() that is used outside this module.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@739487 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:46:56 +00:00
Roy T. Fielding
2288718073 name protect unixd_setup_child and restore its prototype to unixd.h
If someone wants to find a better place for it, then feel free to
so so only if you compile with -Werror before committing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@739151 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 02:51:32 +00:00
Nick Kew
7061cf0770 Match up formats with args in error messages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@738526 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 16:23:11 +00:00
William A. Rowe Jr
53dd6cf3a2 eliminating 9x legacy code from mod_win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731971 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 15:22:38 +00:00
Rainer Jung
391993515f Silence compiler warning about unused variable cfg.
dtrace_enabled is static, so no need for using
the configuration at the moment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731251 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 13:11:04 +00:00
Rainer Jung
5aea845c62 vi broke event ;)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731073 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 19:52:34 +00:00
Rainer Jung
59b02aa75b Prevent empty test statement.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730800 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 17:40:55 +00:00
Rainer Jung
e5a4be062e Add a header check for priv.h to mod_privileges.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730718 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 13:55:52 +00:00