www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Code Activity
26,123 Commits 62 Branches 306 Tags
a902bda00305697d3bea379db7aa0894de8e5a1e
Commit Graph

744 Commits

Author SHA1 Message Date
Jeff Trawick
e451f92748 follow-up to r1096569: 
remove unnecessary total_modules calculation


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1565711 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-07 16:15:20 +00:00
Eric Covener
41488e891d SECURITY (CVE-2014-0231): Fix for DoS due to hang waiting for CGI script. 
Patch one of two.

Permit a read timeout to be used in mod_cgid to give up on a slow CGI script.

In trunk, it defaults to the servers Timeout.  PR43494 

Submitted By: Eric Covener, Toshikuni Fukaya
Reviewed By: Eric Covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1535125 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-23 19:26:08 +00:00
Guenter Knauf
3b905a6fb4 Fix some compiler warnings. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1500362 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-07 03:12:52 +00:00
Rainer Jung
431eeb164d Reduce stack usage, 32 bytes are enough here, no need to 
take 8k in the stack. (19 would be enough, but be safe...)
Use the size of the buffer as opposed to MAX_STRING_LEN.

Followup to r1491221+r1491479: change consistently
the same code used in another place in the same file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1491538 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-10 17:46:53 +00:00
Graham Leggett
5ac83f071f Use the size of the buffer as opposed to MAX_STRING_LEN. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1491479 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-10 14:49:26 +00:00
Christophe Jaillet
9710c6287f Reduce stack usage, 32 bytes are enough here, no need to take 8k in the stack. (19 would be enough, but be safe...) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1491221 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-09 13:52:17 +00:00
Graham Leggett
9bc9d79079 core: Stop the HTTP_IN filter from attempting to write error buckets 
to the output filters, which is bogus in the proxy case. Create a
clean mapping from APR codes to HTTP status codes, and use it where
needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482522 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 18:58:06 +00:00
Stefan Fritsch
e00688ffd9 Use %pm available since apr 1.3 instead of an extra call to apr_strerror 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463056 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-31 21:29:28 +00:00
Jim Jagielski
441cc2c358 this is broken... pull out 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1450998 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-27 22:16:34 +00:00
Jim Jagielski
f9ec3e7b20 This is useful info for mod_status ;) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1448171 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-20 14:02:28 +00:00
Christophe Jaillet
e5e91f8315 Use ap_rputs instead of ap_rvputs where applicable. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418524 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-07 22:31:40 +00:00
Jim Jagielski
97b4169558 Add useful mod_status info... try to determine last time 
a specific vhost was accessed/used.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1417529 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-05 17:07:50 +00:00
Jim Jagielski
18cc8e835b CVE-2012-3499 and CVE-2012-4558 
Be sure to escape potential troubled strings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1413732 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-26 17:18:54 +00:00
Christophe Jaillet
e4a8666bfa Replace an incorrect #if by the correct corresponding #if defined(...) 
PR 54133 reported by Teodor Milkov ()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407965 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-11 12:53:11 +00:00
Igor Galić
c2aeddf1cb partially reverting r1403043: Titled xforms but modifying a config5.m4 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1403044 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-28 17:14:23 +00:00
Igor Galić
dedbe0198f xforms 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1403043 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-28 17:10:47 +00:00
Christophe Jaillet
940259c95d No need to test for NULL before calling apr_pstrdup. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1398025 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-14 06:54:36 +00:00
Christophe Jaillet
2cf5acd15f s/;;/;/ 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1397636 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-12 16:41:34 +00:00
Jim Jagielski
1722688cb3 Break out loadavg from Apache load.... one is quick, the other 
isn't so much, and so why load things up when wanting just
the server loadavg?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389564 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-24 20:50:58 +00:00
Jim Jagielski
1b69b60f1d minor name change, but I expect most will just want/need/use 
the current load average, so simplify the name

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389506 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-24 18:17:50 +00:00
Jim Jagielski
1134cfb81d Would be nice to have some sort of canonical definition 
of server loading for Apache. So create a struct that
holds some useful data. The hope is that for those
platforms that lack getloadavg(), people will write
replacements.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389481 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-24 16:56:58 +00:00
Guenter Knauf
7814748ab3 NetWare build tweaks. 
Make more use of internal makefile macros;
axed now obsolete include paths.
Submitted by: normw gknw net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1371177 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-09 12:11:09 +00:00
Jeff Trawick
d44be5e870 follow-on to r1097070: 
axe unnecessary trailing comma


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369904 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-06 18:12:15 +00:00
Stefan Fritsch
8ec0c56b02 Code clean up (remove useless memory allocation) 
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 52648


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1361803 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-15 21:19:54 +00:00
Stefan Fritsch
fe4f92509b Replace use of apr_file_write() with apr_file_write_full() to prevent 
incomplete writes.

Add comments in some places where error handling/logging is missing.

PR: 53131.
Submitted by: Nicolas Viennot <apache viennot biz>, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331110 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-26 21:44:51 +00:00
Jim Jagielski
5caa336986 Move away from DEFAULT_REL_RUNTIMEDIR and use ap_runtime_dir_relative() 
API

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1299718 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-12 15:45:03 +00:00
Stefan Fritsch
bb6cc59dc6 Display registered providers 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225799 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 11:00:31 +00:00
Stefan Fritsch
13a94b29b6 Sort list of modules 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225796 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 10:52:51 +00:00
Stefan Fritsch
92696d1b3c Display all those shiny new hooks that we have in 2.4 
Add new section "Other Hooks" for those that don't fit into "Startup Hooks"
or "Request Hooks"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225795 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 10:49:43 +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
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
Stefan Fritsch
b4ec041ba7 Remove more log message prefixes that are now redundant as the 
the error log format includes the module name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208110 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 22:28:21 +00:00
Eric Covener
04d5492b0b roll back pair of recent autoindex changes (1204355:1204306) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204356 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-21 05:12:12 +00:00
Eric Covener
a109706a9e PR51471: IndexIgnore doesn't work in DirectoryMatch. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204341 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-21 03:29:12 +00:00
Eric Covener
6c2475f70e PR39923: Allow AddDescription to work with absolute filesystem paths, 
by not adding "*/" to their prefix (intended for relative paths)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204307 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-21 01:03:15 +00:00
Rainer Jung
cd94ba9c69 Change module sets and default activation status: 
1) Promoted from "most" to "few"

- mod_headers

2) Demoted from "yes" to "most"

- mod_actions
- mod_allowmethods
- mod_auth_form
- mod_buffer
- mod_cgi(d)
- mod_include
- mod_negotiation
- mod_ratelimit
- mod_request
- mod_userdir

Remember: default module set is "most",
but only the LoadModule lines of all
modules except "yes" are commented out by default.

The following modules will now be loaded by default:

- mod_access_compat
- mod_alias
- mod_auth_basic
- mod_authn_core
- mod_authn_file
- mod_authz_core
- mod_authz_groupfile
- mod_authz_host
- mod_authz_user
- mod_autoindex
- mod_dir
- mod_env
- mod_filter
- mod_headers
- mod_log_config
- mod_mime
- mod_mpm_event
- mod_reqtimeout
- mod_setenvif
- mod_status
- mod_unixd
- mod_version


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201111 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-12 00:12:50 +00:00
Stefan Fritsch
cd17cd2c10 Consistenly use apr_file_* API instead of libc when dumping config because 
mixing the two can give strange results due to buffering.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180671 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-09 17:55:06 +00:00
Stefan Fritsch
a216c436c6 Downgrade error log messages which accompany a 404 request status from loglevel 
error to info.

List thread at
http://mail-archives.apache.org/mod_mbox/httpd-dev/201110.mbox/%3Calpine.DEB.2.00.1110041948280.664@eru.sfritsch.de%3E

PR: 35768


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180328 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-08 07:36:56 +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
Eric Covener
f08932bf97 PR51371: cross-compile issues with cgi and apr_procattr_limit_*. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1172019 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-17 17:01:15 +00:00
Rich Bowen
5ee61031b1 For consistency, makes the "Loaded Modules" section of the mod_info output into a top-level section, and provides a link to it. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152179 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-29 11:56:26 +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
Eric Covener
b1b5e91608 improve (but preserve searchable parts of) the error message when Options 
-Indexes is about to trigger a 403 in mod_autoindex, with a pointer
to mod_dir about how the DirectoryIndex might have been the real culprit.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147339 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-15 22:32:42 +00:00
Stefan Fritsch
32d9e326ef adjustments of build priorities of modules without special dependencies 
all -> most:
- mod_sed

reallyall -> most:
- mod_log_debug

reallyall -> all:
- mod_dav_lock
- mod_echo
- mod_charset_lite
- mod_slotmem_plain
- mod_dialup

few -> all:
- mod_data
- mod_reflector
- mod_asis

most -> all:
- mod_heartbeat
- mod_heartmonitor
- mod_watchdog

most -> reallyall:
- mod_imagemap
- mod_cern_meta
- mod_ident

See thread at
http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%3C201107052321.56063.sf@sfritsch.de%3E


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146227 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-13 18:59:28 +00:00
Stefan Fritsch
6d8de2ff42 Rename MaxClients to MaxRequestWorkers which describes more accurately what 
it does.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137744 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-20 19:00:52 +00:00
Stefan Fritsch
59c52538f3 Code cleanup: replace apr_table_set with non-copying apr_table_setn 
in a few places

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137413 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-19 18:50:12 +00:00
Stefan Fritsch
99a601df31 Display information about asynchronous connections in the server-status 
PR: 44377


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137360 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-19 12:27:23 +00:00
Stefan Fritsch
82ea6d066e Fix handling of cumulative system time 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135170 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-13 16:49:48 +00:00