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

453 Commits

Author SHA1 Message Date
Gregg Lewis Smith
4708643686 Added proxy_html and xml2enc to Windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1196876 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 00:01:55 +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
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
62441a77e4 Fix issues found by PVS-Studio static analyzer:
mod_mime_magic:
cut'n'paste error rsl_encoding vs. rsl_separator, also simplify code a bit

mod_header:
wrong string initialization (leading to segfault if format argument is missing)

util_win32: duplicate sizeof (untested; Windows people, please review)

PR: 51542
Submitted by: Andrey Karpov <karpov viva64 com>, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1172732 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 18:04:47 +00:00
Guenter Knauf
82b385559c Added new mods to Windows build system.
Submitted by: Gregg L. Smith <gls gknw net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147823 13f79535-47bb-0310-9956-ffa450edef68
2011-07-18 11:58:43 +00:00
Stefan Fritsch
255f723fef We already have ap_str_tolower(), so also add ap_str_toupper() function and use
it where possible.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1138617 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 20:24:27 +00:00
Stefan Fritsch
c9fd2623da Introduce ap_(get|set)_core_module_config() functions/macros and use them
everywhere.

We know that the core module has module_index 0. Therefore we can save
some pointer operations in ap_get_module_config(cv, &core_module) and
ap_set_module_config(cv, &core_module, val). As these are called rather often,
this may actually have some (small) measurable effect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132781 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 21:26:56 +00:00
William A. Rowe Jr
b8f7612eca Correct Win64 Servername Identification
PR: 47418
Submitted by: [Jorge Schrauwen <jorge.schrauwen gmail.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1104624 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17 23:21:00 +00:00
Jeff Trawick
ca353e4ed1 include <stdlib.h> to ensure that the exit() prototype has been
seen before the exit macro is defined (fixes compile failure on
MinGW)

axe prototype for absent function set_listeners_noninheritable() 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090417 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 19:57:24 +00:00
Jeff Trawick
f658e4a08b gcc compatibility
PR: 49535 (subset of reported issues)
Submitted by: John Vandenberg <jayvdb gmail.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089954 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 19:39:48 +00:00
Jeff Trawick
97597f6968 axe a couple of unused vars, mark a function as static
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089690 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 00:07:50 +00:00
Jeff Trawick
209fe38e89 get prototype for ap_os_create_privileged_process()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089689 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 00:06:31 +00:00
Jeff Trawick
d16e497e0f cleanups to function signatures, prototypes, visibility
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089600 13f79535-47bb-0310-9956-ffa450edef68
2011-04-06 19:46:09 +00:00
Jeff Trawick
ddf06604b5 enable DEFAULT_REL_RUNTIMEDIR on NetWare and Windows
this commit is missing the Windows and NetWare build
logic to copy the appropriate file to include/ap_config_layout.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086073 13f79535-47bb-0310-9956-ffa450edef68
2011-03-27 23:51:18 +00:00
Jeff Trawick
46bdc28bf4 fix some logging calls to include the server_rec
(and even the conn_rec in a couple of places)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1074871 13f79535-47bb-0310-9956-ffa450edef68
2011-02-26 15:32:01 +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
ed79086152 Added slotmem* modules to Win32 build.
Submitted by Gregg L. Smith - gregg AT apachehaus.com.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063507 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 23:05:46 +00:00
Guenter Knauf
d058fb69c9 Added mod_reflector to Win32 build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1059644 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 19:39:33 +00:00
Guenter Knauf
023e727183 Removed define obsolete since r93260.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1052774 13f79535-47bb-0310-9956-ffa450edef68
2010-12-25 12:44:37 +00:00
Eric Covener
49bd9d3de1 Per the existing comment and setrlimit() behavior -- only prevent attempts to
raise the hard limit, not to lower it, by nonroot users.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042198 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 15:06:29 +00:00
Rainer Jung
f6816b7aa2 Fix Windows build of mod_cache_disk which was broken after
renaming the module.

Submitted by: Gregg L. Smith <lists glsnet net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039295 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 10:02:49 +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
Guenter Knauf
3de53d843c Removed leftover from IDE build times.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1004519 13f79535-47bb-0310-9956-ffa450edef68
2010-10-05 04:05:06 +00:00
Guenter Knauf
b59acde98e Fixed declaration; added return value.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1004298 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 15:49:28 +00:00
Guenter Knauf
fdfa6a99fe Changed comments to C stye.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@991632 13f79535-47bb-0310-9956-ffa450edef68
2010-09-01 18:14:11 +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
Guenter Knauf
81dac39aab Added casts to silent compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@983412 13f79535-47bb-0310-9956-ffa450edef68
2010-08-08 13:27:59 +00:00
Brian Havard
43880ad962 OS/2: Provide a definition of AP_PLATFORM_REWRITE_ARGS_HOOK.
NULL for now as ap_mpm_rewrite_args()'s -k function doesn't currently work on
OS/2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956859 13f79535-47bb-0310-9956-ffa450edef68
2010-06-22 12:04:03 +00:00
Rainer Jung
90a12694f8 The directives "User", "Group" and "ChrootDir" have
been moved into mod_unixd.

The old macro UNIX_DAEMON_COMMANDS is no longer in use.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954783 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 09:33:20 +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
Jeff Trawick
79d196b3b2 generalize the existing (r589761) platform- and errno-specific
logic to suppress an error message if accept() fails after the
socket has been marked inactive

a message will still be logged, but at debug level instead of error

PR: 49058


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@933657 13f79535-47bb-0310-9956-ffa450edef68
2010-04-13 14:58:03 +00:00
Jeff Trawick
c9b45bef06 build mod_reqtimeout on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@916866 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 23:36:07 +00:00
Jeff Trawick
ffbb8a2e28 fix base addr of mod_serf
Submitted by: Gregg L. Smith <lists@glewis.com>
Reviewed by:  trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@916804 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 20:11:37 +00:00
William A. Rowe Jr
a63cdab32f Finish libserf magic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@906612 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 19:32:24 +00:00
Guenter Knauf
84bda0e64a added watchdog module to NetWare internal module list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885777 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 14:51:47 +00:00
William A. Rowe Jr
6a6cc5a680 Add mod_proxy_scgi; PR 48303; Submitted by: Gregg L. Smith <lists glewis.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885655 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 02:24:31 +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
Guenter Knauf
0368471aa8 removed unused var (seems a leftover from 1.3 days).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791588 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:55:42 +00:00
William A. Rowe Jr
57112d5328 Complete the integration of mod_heartbeat, mod_heartmonitor and the
loadable mod_watchdog, started with 771581.

This clears my list of missing modules as of 6 weeks ago, might be
a few new still to clear up.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771589 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 06:47:21 +00:00
William A. Rowe Jr
0fe6d791a5 complete r771579, refactoring mod_watchdog as loadable on win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771581 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 06:26:24 +00:00
William A. Rowe Jr
7861cb5d18 MPM's are now dynamically loadable; so must mod_watchdog be.
The only module with an excuse now is mod_so which implements
LoadModule itself.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771579 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 06:23:29 +00:00
William A. Rowe Jr
b7eba4ab7f Add balancer module targets
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771564 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 04:58:44 +00:00
William A. Rowe Jr
2bb8b243e0 Introduce mod_remoteip to trunk from httpd/sandbox/mod_remoteip
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@767786 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 04:19:36 +00:00
Jeff Trawick
0d2cef82b3 stop exporting APACHE_MPM_DIR to modules -- unclear why this was ever necessary, and it
makes no sense with loadable MPMs
axe the unnecessary MPM_DIR build variable
move the stray APACHE_SUBST(MPM_LIB) from configure.in to server/mpm/config.m4, where
  the other MPM_foos are handled


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@760403 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 11:34:49 +00:00
Jim Jagielski
0464e456f6 revert 759711 and 759713... don't require apr2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@760026 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 16:10:26 +00:00
Mladen Turk
f1d5422ab9 0600 is UWRITE+UREAD
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759713 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 16:10:02 +00:00
Mladen Turk
0e19eb7475 Use apr-2 object perms setter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759711 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 16:05:53 +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
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