summaryrefslogtreecommitdiff
path: root/os
Commit message (Collapse)AuthorAgeFilesLines
* Merge r1657692, r1660800 from trunkChristophe Jaillet2015-02-271-2/+2
| | | | | | | | | | | * Save a few bytes in conf pool when parsing some directives. Use temp_pool when applicable. Submitted by: jailletc36 Reviewed by: jailletc36, ylavic, covener Backported by: jailletc36 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1662639 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1611978, r1612068 from trunk:Jim Jagielski2014-09-052-4/+4
| | | | | | | | | | | | | | | Add missing APLOGNO. Refactor to keep APLOGNO on the same line as ap_log_error, when applicable. Add missing APLOGNO. Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable. Split lines longer than 80. Improve alignment. Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1622706 13f79535-47bb-0310-9956-ffa450edef68
* Merged ↵Jeff Trawick2014-04-161-0/+1
| | | | | | | | | | | | | | | | /httpd/httpd/trunk:r1515403,1515411,1515420,1517175,1521909,1526647,1541181,1578762,1585054,1585072,1588054 mod_authnz_fcgi: New module to enable FastCGI authorizer applications to authenticate and/or authorize clients. Submitted by: trawick, jailletc36, gsmith Approved by: trawick, jim, gsmith (Thanks gsmith for the Windows build bits!) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588064 13f79535-47bb-0310-9956-ffa450edef68
* * easy proposals to synch 2.4.x and trunkGraham Leggett2013-12-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - log.c: avoid needless apr_pstrdup() - Use apr_pstrmemdup instead of apr_pstrndup when this is safe. - Use apr_pstrmemdup instead of apr_pstrndup when this is safe. - Remove redundant check - 'ap_getword_conf' does not return NULL but an empty string - Ease logic around 'ap_getword_conf' and drop useless line of code. - 'ap_getword_conf' can not return NULL - 'ap_getword_conf' can not return NULL - Remove redundant check (already performed the line before) - Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable trunk patches: - https://svn.apache.org/viewvc?view=revision&revision=1532122 - https://svn.apache.org/viewvc?view=revision&revision=1549676 - https://svn.apache.org/viewvc?view=revision&revision=1549680 - https://svn.apache.org/viewvc?view=revision&revision=1550651 - https://svn.apache.org/viewvc?view=revision&revision=1551005 - https://svn.apache.org/viewvc?view=revision&revision=1551009 - https://svn.apache.org/viewvc?view=revision&revision=1551010 - https://svn.apache.org/viewvc?view=revision&revision=1551011 - https://svn.apache.org/viewvc?view=revision&revision=1551012 - https://svn.apache.org/viewvc?view=revision&revision=1551013 2.4.x patches: trunk patches work http://people.apache.org/~jim/patches/ez-2.4-v2.patch +1: jailletc36, jim, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1553532 13f79535-47bb-0310-9956-ffa450edef68
* like trunk r1522544, except the fixBaseAddrs.pl script lives in trunk:Jeff Trawick2013-09-121-113/+118
| | | | | | | | | | | | | | | | BaseAddr.ref: . Update sizes as necessary based on a 64-bit debug build with Visual Studio 2012. . Add missing modules mod_dialup, mod_optional_fn_export, mod_optional_fn_import, mod_optional_hook_export, and mod_optional_hook_import. (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.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1522687 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, ↵Jim Jagielski2013-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1453963, r1454386, r1454414, r1454415, r1458285, r1458447 from trunk: Rough start for simple, tunneling websocket proxy support. Compiles at this stage and that's all I know :) force correct scheme info We need to ensure a conn_rec Work around blocking issues... And now pass the initial request to the backend... I dislike this duplication of code from mod_proxy_http() but maybe it's inevitable. I may create ap_proxy_create_headerb() to create a header brigade that both modules can use. Pull out duplicated code to proxy_util... rename extension module... tunnel is more accurate log nums "final" rename :) don't strip these, ensure that they exist. streamline bypass reqtimeout for websockets Keep mod_req clear. Simply scan thru input filters and remove it within the ws submodule. Nasty, but it keeps mod_req untouched (for now ;) ) Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1492699 13f79535-47bb-0310-9956-ffa450edef68
* mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700).Gregg Lewis Smith2013-06-111-24/+24
| | | | | | | | | backport r1439027 Expand mod_lua stack size to fit image and readdress the remaining modules git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1491922 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, ↵Jim Jagielski2013-04-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1406760, r1418648 from trunk: Update transformations. syntax for mod_b*.xml and mod_c*.xml mod_cache_socache: New cache implementation backed by mod_socache that replaces mod_mem_cache removed from httpd v2.2. Windows build for mod_cache_socache added in r1388660 Fix the return values on mod_cache_socache's store_headers() implementation to return APR errors codes and not DECLINED. We are committed to using this implementation by this point, and any error should force us to stand down. Submitted by: trawick Reviewed by: minfrin Apply proper APLOGNO codes for mod_cache_socache. Added mod_cache_socache to NetWare build. * Ensure that nkey is initialized. mod_cache_socache: Don't clean up too soon. If we do, revalidated requests lose their bodies. Submitted by: minfrin, humbedooh, minfrin, gsmith, minfrin, minfrin, fuankg, rpluem, minfrin Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477652 13f79535-47bb-0310-9956-ffa450edef68
* Add mod_macro to Windows Build. merge/backport r1436058Gregg Lewis Smith2013-03-271-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1461781 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1442865, r1442759, r1442326, r1442309, r1448171, r1418556, r1448453, ↵Jim Jagielski2013-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1425771, r1425772, r1425775 from trunk: Change bzero/bcopy into memset/memcpy PR 54346 Can't figure out why we allocate len+2 bytes here. Len+1 should be enough. Fix valgrind warning about uninitialized memory in argument to semctl PR: 53690 Submitted by: Mikhail T. <mi+apache aldan algebra com> fix valgrind warnings about uninitialized memory in syscall arguments This is useful info for mod_status ;) Add some __attribute__ for automatic format checking. Correct one catch in sed0.c. Correct some spelling. Replace strdup by ap_malloc to ensure a proper error message if out-of-memory. While there, only allocate memory for the string part we actually use. PR: 54345 Exit with error message if out of mem htdbm, htpasswd: print error message if out of memory PR: 54345 Submitted by: jailletc36, sf, sf, jim, jailletc36, minfrin, sf, sf, sf Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1455225 13f79535-47bb-0310-9956-ffa450edef68
* Various code cleanup to avoid compiler, cppcheck, or clang warnings:Stefan Fritsch2011-12-181-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/branches/2.4.x@1220509 13f79535-47bb-0310-9956-ffa450edef68
* fix my typoGregg Lewis Smith2011-12-061-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210870 13f79535-47bb-0310-9956-ffa450edef68
* Backport r1209766, r1210252, r1210284:Stefan Fritsch2011-12-052-12/+12
| | | | | | | | | | Add lots of unique tags to error log messages ssl_util.c: Downgrade some dynamic locking messages from level DEBUG to TRACE1-3 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210287 13f79535-47bb-0310-9956-ffa450edef68
* backport r1203924 from trunkGregg Lewis Smith2011-11-191-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1203925 13f79535-47bb-0310-9956-ffa450edef68
* Fix whitespace/styleGregg Lewis Smith2011-11-151-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1202366 13f79535-47bb-0310-9956-ffa450edef68
* Add mod_data to Windows buildGregg Lewis Smith2011-11-151-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1202055 13f79535-47bb-0310-9956-ffa450edef68
* Pre GA removal ob components that will not be included:Rainer Jung2011-11-121-10/+9
| | | | | | | Part 2: Remove mod_serf. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201210 13f79535-47bb-0310-9956-ffa450edef68
* Added proxy_html and xml2enc to Windows buildGregg Lewis Smith2011-11-031-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1196876 13f79535-47bb-0310-9956-ffa450edef68
* Add -D DUMP_RUN_CFG option to dump some configuration itemsStefan Fritsch2011-10-091-0/+1
| | | | | | | | | 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
* More cleanup: Expand tabs and some more indentation fixesStefan Fritsch2011-09-232-3/+3
| | | | | | | No functional change git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
* Cleanup effort in prep for GA push:Jim Jagielski2011-09-234-9/+9
| | | | | | | | Trim trailing whitespace... no func change git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
* Fix issues found by PVS-Studio static analyzer:Stefan Fritsch2011-09-191-1/+1
| | | | | | | | | | | | | | | | 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
* Added new mods to Windows build system.Guenter Knauf2011-07-181-0/+3
| | | | | | | 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
* We already have ap_str_tolower(), so also add ap_str_toupper() function and useStefan Fritsch2011-06-222-18/+0
| | | | | | | it where possible. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1138617 13f79535-47bb-0310-9956-ffa450edef68
* Introduce ap_(get|set)_core_module_config() functions/macros and use themStefan Fritsch2011-06-062-2/+2
| | | | | | | | | | | | 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
* Correct Win64 Servername IdentificationWilliam A. Rowe Jr2011-05-171-0/+4
| | | | | | | | 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
* include <stdlib.h> to ensure that the exit() prototype has beenJeff Trawick2011-04-081-3/+1
| | | | | | | | | | 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
* gcc compatibilityJeff Trawick2011-04-071-1/+1
| | | | | | | | 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
* axe a couple of unused vars, mark a function as staticJeff Trawick2011-04-071-3/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089690 13f79535-47bb-0310-9956-ffa450edef68
* get prototype for ap_os_create_privileged_process()Jeff Trawick2011-04-071-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089689 13f79535-47bb-0310-9956-ffa450edef68
* cleanups to function signatures, prototypes, visibilityJeff Trawick2011-04-062-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089600 13f79535-47bb-0310-9956-ffa450edef68
* enable DEFAULT_REL_RUNTIMEDIR on NetWare and WindowsJeff Trawick2011-03-272-0/+62
| | | | | | | | 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
* fix some logging calls to include the server_recJeff Trawick2011-02-262-3/+3
| | | | | | | (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
* Axed C++ comments and tabs.Guenter Knauf2011-02-261-5/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1074809 13f79535-47bb-0310-9956-ffa450edef68
* Added slotmem* modules to Win32 build.Guenter Knauf2011-01-251-0/+2
| | | | | | | 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
* Added mod_reflector to Win32 build.Guenter Knauf2011-01-161-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1059644 13f79535-47bb-0310-9956-ffa450edef68
* Removed define obsolete since r93260.Guenter Knauf2010-12-251-3/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1052774 13f79535-47bb-0310-9956-ffa450edef68
* Per the existing comment and setrlimit() behavior -- only prevent attempts toEric Covener2010-12-041-1/+4
| | | | | | | | 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
* Fix Windows build of mod_cache_disk which was broken afterRainer Jung2010-11-261-1/+1
| | | | | | | | | 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
* suEXEC: Add Suexec directive to disable suEXEC without renaming theJeff Trawick2010-11-101-0/+1
| | | | | | | | | | | | | 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
* Removed leftover from IDE build times.Guenter Knauf2010-10-051-5/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1004519 13f79535-47bb-0310-9956-ffa450edef68
* Fixed declaration; added return value.Guenter Knauf2010-10-041-3/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1004298 13f79535-47bb-0310-9956-ffa450edef68
* Changed comments to C stye.Guenter Knauf2010-09-011-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@991632 13f79535-47bb-0310-9956-ffa450edef68
* Added require prototypes conditionally to CFLAGS for NETWare;Guenter Knauf2010-09-011-7/+13
| | | | | | | added header includes for getting protos. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@991588 13f79535-47bb-0310-9956-ffa450edef68
* Added casts to silent compiler warnings.Guenter Knauf2010-08-081-5/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@983412 13f79535-47bb-0310-9956-ffa450edef68
* OS/2: Provide a definition of AP_PLATFORM_REWRITE_ARGS_HOOK.Brian Havard2010-06-221-0/+1
| | | | | | | | 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
* The directives "User", "Group" and "ChrootDir" haveRainer Jung2010-06-151-8/+0
| | | | | | | | 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
* Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to takeStefan Fritsch2010-06-062-0/+3
| | | | | | | advantage of per-module loglevels git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
* generalize the existing (r589761) platform- and errno-specificJeff Trawick2010-04-131-3/+4
| | | | | | | | | | | | 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
* build mod_reqtimeout on WindowsJeff Trawick2010-02-261-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@916866 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status