1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

472 Commits

Author SHA1 Message Date
Christophe Jaillet
6625c31ba1 'ap_getword_conf' does not return NULL but an empty string if nothing could be got.
So the message 02173 can never trigger.

Actually, this is not a problem because all calls to 'ap_unixd_set_rlimit' are done in configuration parsing functions guarded with AP_INIT_TAKE12, so we are guaranteed to have something.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551005 13f79535-47bb-0310-9956-ffa450edef68
2013-12-15 07:53:09 +00:00
Jeff Trawick
86335b8bb8 BaseAddr.ref:
. Update sizes as necessary based on a 64-bit debug build with Visual Studio
  2012.
. Add missing modules mod_apreq, mod_authnz_fcgi, mod_dialup,
  mod_optional_fn_export, mod_optional_fn_import, mod_optional_hook_export,
  mod_optional_hook_import, and mod_policy.
  (The example mods aren't important, but adding them avoids having to
  treat those as exceptions in any sort of automatic update mechanism.
  Potential issues with the several modules that aren't currently buildable
  with the cmake-based solution have not been addressed.)

fixBaseAddrs.pl:
. New script to generate a new BaseAddr.ref based on Microsoft linker
  warnings about inadequate size or missing module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1522544 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 12:15:02 +00:00
Gregg Lewis Smith
143d9b62b8 Increase stack size for mod_cache and mod_ldap and readdress
VC11 reporting image size exceeds specified maximum

Reported by Steffen <info apachelounge com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1505178 13f79535-47bb-0310-9956-ffa450edef68
2013-07-20 18:14:43 +00:00
Gregg Lewis Smith
e5d0f97ec8 Final rename per r1454386, we hope
Set eol style of mod_proxy_wstunnel.dsp to native
for easy editing on any OS



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454659 13f79535-47bb-0310-9956-ffa450edef68
2013-03-09 05:51:48 +00:00
Gregg Lewis Smith
723bba5dff finish up mod_proxy_websocket/tunnel rename on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453974 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 17:27:55 +00:00
Gregg Lewis Smith
60efc021bb Add mod_proxy_websocket to Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453552 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 20:54:48 +00:00
William A. Rowe Jr
a7a919ad86 The days of 9x, Win2K are long gone. No more need of a stub
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1447992 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 04:03:42 +00:00
Stefan Fritsch
d5a372ff78 Fix valgrind warning about uninitialized memory in argument to semctl
PR: 53690
Submitted by: Mikhail T. <mi+apache aldan algebra com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1442326 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 20:15:10 +00:00
Gregg Lewis Smith
62980ad902 fix r1439000 per rjung remarks
http://marc.info/?l=apache-httpd-dev&m=135925949528376&w=2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439027 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 05:45:21 +00:00
Gregg Lewis Smith
3fb478dd70 mod_lua image size has surpassed 0x00010000, step it up a notch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439000 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 00:08:04 +00:00
Gregg Lewis Smith
8e0c2d91e0 Add mod_macro to Windows build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436058 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 01:20:33 +00:00
Gregg Lewis Smith
3e8254fb4c Add mod_allowhandlers to Windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418867 13f79535-47bb-0310-9956-ffa450edef68
2012-12-09 09:46:47 +00:00
Gregg Lewis Smith
f696d241c7 Windows build for mod_cache_socache added in r1388660
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388899 13f79535-47bb-0310-9956-ffa450edef68
2012-09-22 21:14:00 +00:00
Stefan Fritsch
76f782e188 Various code cleanup to avoid compiler, cppcheck, or clang warnings:
modules/debugging/mod_firehose.c: Make some internal functions static
                                  (to do: logs_cleanup() is unused)

modules/filters/mod_charset_lite.c: Remove dead assignments

modules/filters/mod_include.c: likewise

modules/metadata/mod_usertrack.c: likewise

modules/proxy/mod_proxy_ftp.c: likewise

modules/ssl/ssl_engine_pphrase.c: likewise

modules/proxy/mod_proxy_balancer.c: likewise;
                                    Remove NULL check that can never happen

modules/proxy/proxy_util.c: Axe NULL-check that can never happen and if it
                            would, it would just mask another bug

os/unix/unixd.c: likewise

modules/http/http_filters.c: Remove sub-condition that is always true

modules/lua/mod_lua.c: Add default cases to switch statements

modules/generators/mod_autoindex.c: Unsigned value can never be < 0

server/util_expr_eval.c: Fix compiler warnings with VC and on OS2



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220493 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 17:52:59 +00:00
Gregg Lewis Smith
86598d3b90 Fix my typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210869 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 11:28:44 +00:00
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 23:02:04 +00:00
Gregg Lewis Smith
1a3e83723a Build mod_allowmethods on Windows
project file exists


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203924 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 00:35:17 +00:00
Gregg Lewis Smith
324946aeb5 Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1202537 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 06:27:41 +00:00
Gregg Lewis Smith
4cb6f6baad Add mod_data to Windown build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1202365 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 18:36:06 +00:00
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