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

789 Commits

Author SHA1 Message Date
Jacob Champion
1b223229a1 configure: don't overwrite other_targets when mod_suexec is enabled
Just append to the list.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796201 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:30 +00:00
Nick Kew
38e269322b Introduce request taint-checking concept.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792169 13f79535-47bb-0310-9956-ffa450edef68
2017-04-21 08:44:06 +00:00
Eric Covener
5811344b04 no strncasecmp because flag has no value
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1788451 13f79535-47bb-0310-9956-ffa450edef68
2017-03-24 14:09:52 +00:00
Christophe Jaillet
4c3dc1b748 Use 'ap_cstr_casecmp' to simplify code.
Remove useless case. We know that to can not be NULL at this point.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1788033 13f79535-47bb-0310-9956-ffa450edef68
2017-03-21 23:08:27 +00:00
Christophe Jaillet
efcbe82095 Save a few bytes in the conf pool.
'push_item' and 'add_alt' already duplicate their parameters, so we can safely use the temp_pool here.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1788032 13f79535-47bb-0310-9956-ffa450edef68
2017-03-21 23:05:52 +00:00
Eric Covener
3eb2a25d55 update comments post-r1787525
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1787553 13f79535-47bb-0310-9956-ffa450edef68
2017-03-18 12:51:28 +00:00
Eric Covener
e87d66b81e Add IndexOptions UseOldDateFormat
*) mod_autoindex: Add IndexOptions UseOldDateFormat to allow the date
     format from 2.2 in the Last Modified column. PR60846.
  
   PR34014 / r903052 changed date format for autoindex 

Submitted By: Hank Ibell <hwibell gmail.com>




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1787525 13f79535-47bb-0310-9956-ffa450edef68
2017-03-18 02:51:02 +00:00
Christophe Jaillet
6efb076e68 Remove some spaces to synch with 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772484 13f79535-47bb-0310-9956-ffa450edef68
2016-12-03 20:04:08 +00:00
Yann Ylavic
019efb6465 Follow up to r1739201.
These APR_TIMEUP special cases are now handled by ap_map_http_request_error().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1766998 13f79535-47bb-0310-9956-ffa450edef68
2016-10-28 10:56:03 +00:00
Eric Covener
99d569e788 Stash the cgi PID earlier in mod_cgid
In some cases, a 2nd CGI using the same c->id can get into
the mod_cgid handler before cleanups have been run, causing
the new CGI pid to be used by the first CGI's cleanup function.

Instead of stashing c->id in the request processing thread,
just use it before leaving the handler to get the pid.

May indirectly fix PR57771, but it must have a slightly different
cause because stashing the conn_id slightly differently was 
supposed to be sufficient there.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758083 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 23:15:11 +00:00
Stefan Fritsch
1bde49740f mod_status: note stopping procs in async info table
* add new column "stopping", denoting if a process is shutting down
* add additional "(old gen)", if a process is from before a graceful reload
* add counts of processes and stopping processes to summary line



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757029 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 20:21:39 +00:00
Christophe Jaillet
91af78c1c3 Fix <p> tag closing syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757011 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 16:23:42 +00:00
Christophe Jaillet
96d3d172ea Delay some memory allocation in order to save 272 bytes in the 'request' memory pool if mod_status handler is triggered and is not able to handle the request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757010 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 15:50:22 +00:00
Christophe Jaillet
d7550f7958 Fix the number of column for 'Async connections'.
There are only 3 columns (writing, keep-alive, closing), not 4.

Try to improve the code layout for it to be more readable.
Each <th> is on its own line so keep the corresponding "colspan" <td> fields grouped together.

r1738628 introduced a new column, 'Slot'.
Add an empty cell for it in the last line of the table, in order to fix the layout of the Totals.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757009 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 15:36:12 +00:00
Christophe Jaillet
b1c05817d5 Replace tab by spaces to be consistent
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756848 13f79535-47bb-0310-9956-ffa450edef68
2016-08-18 20:36:56 +00:00
William A. Rowe Jr
f4cc76ee71 Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n](), update with APR doxygen
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1747469 13f79535-47bb-0310-9956-ffa450edef68
2016-06-09 00:06:42 +00:00
Stefan Fritsch
b6dd382dbb Display process slot number in the async overview
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1738628 13f79535-47bb-0310-9956-ffa450edef68
2016-04-11 19:25:27 +00:00
Luca Toscano
4eb7f3d264 mod_cgi/mod_cgid documentation about environment variables added (like DOCUMENT_ROOT).
Bug: 58305



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726506 13f79535-47bb-0310-9956-ffa450edef68
2016-01-24 16:39:30 +00:00
Stefan Eissing
909aa9a87b scoreboard addition of protocol, new ap_udpte_child_status methods
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726009 13f79535-47bb-0310-9956-ffa450edef68
2016-01-21 16:36:33 +00:00
Rainer Jung
685dc52f64 Remove APLOGNO after moving log message to
TRACE1 in r1724847.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725516 13f79535-47bb-0310-9956-ffa450edef68
2016-01-19 13:37:42 +00:00
Rainer Jung
af14d158a3 Added many log numbers to log statements that
had none.

Those were not detected by the coccinelle script.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725485 13f79535-47bb-0310-9956-ffa450edef68
2016-01-19 12:02:41 +00:00
Eric Covener
b20446d9e2 flush errors are TRACE1 in the core output filter now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1724847 13f79535-47bb-0310-9956-ffa450edef68
2016-01-15 16:29:59 +00:00
Yann Ylavic
4bfe0a6bba Follow up to r1715880: revert more abusive ap_casecmpstr[n]() usages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722150 13f79535-47bb-0310-9956-ffa450edef68
2015-12-29 15:32:27 +00:00
Yann Ylavic
6f8a850766 Follow up to r1715880: revert abusive ap_casecmpstr[n]() usages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1716151 13f79535-47bb-0310-9956-ffa450edef68
2015-11-24 14:38:54 +00:00
Yann Ylavic
e30575b0b0 More ap_casecmpstr[n]() usages (follow up to r1715876).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715880 13f79535-47bb-0310-9956-ffa450edef68
2015-11-23 16:48:35 +00:00
Yann Ylavic
c80e6b2a34 Use new ap_casecmpstr[n]() functions where appropriate (not exhaustive).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715876 13f79535-47bb-0310-9956-ffa450edef68
2015-11-23 16:46:01 +00:00
Yann Ylavic
3c9ddf44bf Revert r1715789: will re-commit without spurious functional changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715869 13f79535-47bb-0310-9956-ffa450edef68
2015-11-23 16:28:36 +00:00
Yann Ylavic
29843dc73f Use new ap_casecmpstr[n]() functions where appropriate (not exhaustive).
[Reverted by r1715869]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715789 13f79535-47bb-0310-9956-ffa450edef68
2015-11-23 12:33:09 +00:00
Christophe Jaillet
68131d85a4 Fix some style issues on files that can easily be synch'ed with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705983 13f79535-47bb-0310-9956-ffa450edef68
2015-09-30 08:35:35 +00:00
Eric Covener
6085de039a allow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1701436 13f79535-47bb-0310-9956-ffa450edef68
2015-09-06 02:04:30 +00:00
Yann Ylavic
d9a3b78926 s/\<\(\w\+\)\>\s\+\<\1\>/\1/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690137 13f79535-47bb-0310-9956-ffa450edef68
2015-07-09 18:07:50 +00:00
Rainer Jung
837652cd3b Followon to r1671396: add misiing newline in
new server-status output.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672453 13f79535-47bb-0310-9956-ffa450edef68
2015-04-09 18:59:43 +00:00
Rainer Jung
65c97d7d92 Followon to r1671396:
Remove unwanted redundant output introduced
by that commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672289 13f79535-47bb-0310-9956-ffa450edef68
2015-04-09 10:54:26 +00:00
Rainer Jung
0450264e71 Add more data to "?auto" view of server-status.
Although mod_status source code calls this the
"short_report", the docs and the API flag call
it "Machine Readable" resp. "STAT_OPT_AUTO".
So IMHO the data shown should be on par with
the html version.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671396 13f79535-47bb-0310-9956-ffa450edef68
2015-04-05 13:34:01 +00:00
Eric Covener
280ed85190 Followup to r1667385, my sandbox was out of date.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667386 13f79535-47bb-0310-9956-ffa450edef68
2015-03-17 20:13:39 +00:00
Eric Covener
c27569bfd3 Retry ENOENT like ECONNREFUSED, but only near a server restart.
PR57685

Submitted By: Edward Lu
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667385 13f79535-47bb-0310-9956-ffa450edef68
2015-03-17 20:12:19 +00:00
Yann Ylavic
0a431ef862 core, modules: like r1657897 but for core and other modules than mod_proxy.
More uses of ap_map_http_request_error() and AP_FILTER_ERROR so that we never
return an HTTP error status from a handler if some filter generated a response
already.

That is, from a handler, either ap_get_brigade() (an input filter) returned
AP_FILTER_ERROR and we must forward it to ap_die(), or ap_pass_brigade() (an
output filter) failed with any status and we must return AP_FILTER_ERROR in
any case for ap_die() to determine whether a response is needed or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1665625 13f79535-47bb-0310-9956-ffa450edef68
2015-03-10 17:25:17 +00:00
Daniel Ruggeri
cded18be8c Add class attributes for empty descriptions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1648201 13f79535-47bb-0310-9956-ffa450edef68
2014-12-28 13:43:25 +00:00
Jan Kaluža
84d85f62bb mod_cgi: log cgi script stderr to ScriptLog, use APLOGNO for log_scripterror
errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1626978 13f79535-47bb-0310-9956-ffa450edef68
2014-09-23 11:14:09 +00:00
Rainer Jung
8e18f1a5e9 Add compiled and loaded PCRE version numbers
to "httpd -V" output and to mod_info page.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612934 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 19:53:22 +00:00
Christophe Jaillet
66989ec303 Add missing APLOGNO + fix a typo in a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610518 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 20:44:21 +00:00
Eric Covener
c0be5abcd3 SECURITY: CVE-2014-0231 (cve.mitre.org): Part two of two, with r1535125:
mod_cgid: Fix a denial of service against CGI scripts that do
   not consume stdin that could lead to lingering HTTPD child processes
   filling up the scoreboard and eventually hanging the server.
   [Rainer Jung, Eric Covener, Yann Ylavic]

Submitted By: rjung, covener, ylavic
Reviewed By: trawick, jorton, covener, jim
   


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610509 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 20:08:25 +00:00
Joe Orton
b2605d20c4 SECURITY (CVE-2014-0226): Fix a race condition in scoreboard handling,
which could lead to a heap buffer overflow.  Thanks to Marek Kroemeke
working with HP's Zero Day Initiative for reporting this.

* include/scoreboard.h: Add ap_copy_scoreboard_worker.

* server/scoreboard.c (ap_copy_scoreboard_worker): New function.

* modules/generators/mod_status.c (status_handler): Use it.

* modules/lua/lua_request.c (lua_ap_scoreboard_worker): Likewise.

Reviewed by: trawick, jorton, covener, jim
Submitted by: jorton, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610491 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 19:26:00 +00:00
Christophe Jaillet
b854d7e818 Remove some 'register' in variable declaration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610366 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 09:05:27 +00:00
Yann Ylavic
9614c0b8e6 Strip useless apr_brigade_cleanup() calls.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601624 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 12:44:15 +00:00
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