www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Code Activity
22,539 Commits 62 Branches 304 Tags
e093c8c901bdd256b3b9281f96978c98f71fdefd
Commit Graph

200 Commits

Author SHA1 Message Date
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
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
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
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
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
Igor Galić
d5024cd27c In comments: s@ XX @ XXX: @ so they can actually be found seen. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053668 13f79535-47bb-0310-9956-ffa450edef68
 2010-12-29 16:25:12 +00:00
Graham Leggett
e206531458 Avoid unnecessariy initialisation before we test mod_cgi's handler name. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1024460 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-19 23:07:25 +00:00
Jeff Trawick
0ce133f8a8 Intel's compiler warns about assigning the non-enum value 0 to the 
enumeration apr_finfo_t.filetype, which is done when forgetting
the previously-derived file type

use the appropriate enum value APR_NOFILE instead

Also change comparisons of the field with 0 to use APR_NOFILE instead,
as is the practice of some existing code.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@983065 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-06 17:36:52 +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
Stefan Fritsch
2c4ea84eb8 fix potential file descriptor leak with DEBUG_CGI 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930955 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-05 20:36:23 +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
Ruediger Pluem
3fadc493c9 * Do better checking of pollset operations in various places to avoid segfaults. 
PR: 46467
Submitted by: Stefan Fritsch <sf sfritsch.de>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@804764 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-16 20:29:47 +00:00
Jeff Trawick
ee32468a33 remove OS/2 platform support 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758929 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-26 23:47:52 +00:00
Paul Querna
a324a1d72f Remove all references to CORE_PRIVATE. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645455 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-07 10:45:43 +00:00
Ruediger Pluem
5ebab647ff * Prevent running through the error stack by returning OK and setting r->status 
accordingly if ret is HTTP_NOT_MODIFIED as this breaks mod_cache validating a
  stale entity.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541990 13f79535-47bb-0310-9956-ffa450edef68
 2007-05-27 13:57:46 +00:00
Nick Kew
d09a836fb0 PR#39710 - badly broken errordocuments for CGI 
We've just had another duplicate report of this on bugzilla.
We've got a simple patch, and people asking WTF is going on
with inaction.  Noone seems clear on why the patch shouldn't
be applied (http://marc.info/?l=apache-httpd-dev&m=117760311129386&w=2).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541926 13f79535-47bb-0310-9956-ffa450edef68
 2007-05-26 18:50:18 +00:00
Garrett Rooney
d20ce0c6a1 Follow up to r451006, use APR_STATUS_IS_TIMEUP instead of comparing against 
APR_TIMEUP directly.

Reported by: jorton

* modules/generators/mod_cgi.c
  (cgi_handler): Use APR_STATUS_IS_TIMEUP.

* modules/generators/mod_cgid.c
  (cgid_handler): Ditto.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@451289 13f79535-47bb-0310-9956-ffa450edef68
 2006-09-29 13:48:09 +00:00
Ruediger Pluem
faacd788d1 * Notice that reading of the request entity body failed due to a timeout 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@451006 13f79535-47bb-0310-9956-ffa450edef68
 2006-09-28 20:15:42 +00:00
Nick Kew
8c2b72b53c PR 31759 (mutated) - reported by Jo Rhett 
Don't return apr_status_t error value from input filter chain.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@442758 13f79535-47bb-0310-9956-ffa450edef68
 2006-09-12 23:44:12 +00:00
Roy T. Fielding
de659cbed0 update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:33:53 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 12:11:27 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also 
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:11:44 +00:00
Roy T. Fielding
16ef40e5ff Remove CGI block on OPTIONS method so that scripts can 
respond to OPTIONS directly rather than via server default.

PR: 15242
Reviewed-by: Paul Querna, Andre Malo, William A. Rowe, Jr.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@326255 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-18 21:29:43 +00:00
Justin Erenkrantz
7b005585df Fix bug where non-200 CGI responses will not send anything down filter chain. 
This is most notable when mod_cache is used.  This has been used in production
on wiki.apache.org for a while now.

* modules/generators/mod_cgi.c
  (cgi_handler): When a non-zero value is returned by scan_script, set the
  status field and ensure that we have an EOS to send down the filer stack.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231167 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-10 04:32:13 +00:00
Joe Orton
329615343c * modules/generators/mod_cgi.c (cgi_bucket_read): Log a specific error 
if a timeout occurs from a blocking read; more helpful than a generic
"apr_bucket_read failed" error from some higher-up filter.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@189560 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-08 08:50:19 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-04 20:28:49 +00:00
Joe Orton
a4063b9fba * modules/generators/mod_cgi.c (cgi_handler): Ensure all stderr from 
the script is logged if it generated a non-local redirect.

PR: 20111


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106195 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-22 16:03:20 +00:00
Joe Orton
c48cfec2fd * server/util_filter.c (ap_save_brigade): Handle an ENOTIMPL setaside 
function correctly.

* modules/generators/mod_cgi.c (cgi_handler): Revert r1.169,
unnecessary CGI bucket lifetime kludge.

PR: 31247


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105297 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-26 15:52:51 +00:00
Joe Orton
c69b0be29f * modules/generators/mod_cgi.c (cgi_handler): Fix possible segfaults 
in CGI bucket methods if invoked from a subrequest.

PR: 31247


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105250 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-22 15:38:02 +00:00
André Malo
a97ed90edf #ifndef AP_UNSAFE_ERROR_LOG_UNESCAPED the stderr to errorlog stuff 
for those who don't want to escape (as in server/log.c)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104834 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-26 20:50:55 +00:00
Bill Stoddard
e0c3bc4dcb Escape bytes returned by the errfn because it might be from an untrusted source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104780 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-24 01:49:59 +00:00
Justin Erenkrantz
022f0af97c Remove deprecated APR_STATUS_IS_SUCCESS() macro in favor of direct test against 
APR_SUCCESS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104439 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-01 01:12:30 +00:00
Jean-Jacques Clar
227df09ee4 rev back to previous version, removing chnges to overload detach field , putting back addrspace field 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104251 13f79535-47bb-0310-9956-ffa450edef68
 2004-07-12 16:53:24 +00:00
Jean-Jacques Clar
f2e3f86232 Overloading detached field in cgi_exec_info_t stuct in order to use same field to set detached and addrspace values for proc to be started. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104209 13f79535-47bb-0310-9956-ffa450edef68
 2004-07-09 20:28:48 +00:00
Jean-Jacques Clar
136ee08033 Added new field in apr_procattr_t and cgi_exec_info_t structures to support loading in current or new address space (NetWare ONLY). 
Replaced changes that added APR_PROGRAM_ADDRSPACE committed 6/11/04.
Reviewed by Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103946 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-14 17:28:25 +00:00
Joe Orton
0df6a7dbfe * modules/generators/mod_cgi.c (cgi_handler): Soak up stderr from nph- 
scripts correctly.

PR: 18348
Submitted by: Jeff Trawick (in mod_jcgi)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103622 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-05 15:30:53 +00:00
Joe Orton
46fb957d01 * modules/generators/mod_cgi.c (cgi_handler): Combine common code 
between nph and non-nph handling; use a CGI bucket for both cases if
APR_FILES_AS_SOCKETS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103621 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-05 14:52:44 +00:00
Joe Orton
d4cb879b8f Implement the "CGI bucket" in mod_cgi to handle stderr output during 
script execution, preventing deadlock if stderr output fills the pipe
buffer:

* modules/generators/mod_cgi.c (log_script_err): Return a read error.
(cgi_bucket_create, cgi_bucket_dup, cgi_read_stdout, cgi_bucket_read):
New functions.
(cgi_handler): Use new CGI bucket rather than a pipe bucket if
APR_FILES_AS_SOCKETS; use zero read timeout from stdout/stderr during
script execution.

PR: 22030
Submitted by: Joe Orton, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103437 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-18 16:02:57 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-09 20:31:03 +00:00
André Malo
d0e05bada9 fix copyright dates according to the first check in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102565 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 12:07:22 +00:00
André Malo
0d57db3af2 apply Apache License, 2.0 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102524 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-06 22:19:28 +00:00
André Malo
fb07607180 update license to 2004. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
 2004-01-01 13:26:26 +00:00
Cliff Woolley
aaf0424e2b get rid of _FOREACH 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101788 13f79535-47bb-0310-9956-ffa450edef68
 2003-11-16 02:09:14 +00:00
Jeff Trawick
aa21671e13 switch to APR 1.0 API (which is still in flux) 
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
 2003-09-03 19:27:12 +00:00
André Malo
b37c094b16 drop superfluous argument from ap_ssi_parse_string. 
The new API should now be stable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101069 13f79535-47bb-0310-9956-ffa450edef68
 2003-08-22 23:14:30 +00:00
André Malo
728dc394a9 adjust mod_cgi and mod_cgid 
bump MMN for API change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101047 13f79535-47bb-0310-9956-ffa450edef68
 2003-08-21 22:12:08 +00:00
Jeff Trawick
25be2b6a89 Fix the inability to log errors like exec failure in 
mod_ext_filter/mod_cgi script children (e.g., exec failure).  This
was broken after such children stopped inheriting the error log
handle.

(For this to work with mod_ext_filter, that module's LogStderr option
has to be on.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99211 13f79535-47bb-0310-9956-ffa450edef68
 2003-04-04 18:55:49 +00:00
Jeff Trawick
b535985b9b mod_cgi, mod_cgid, mod_ext_filter: Log errors when scripts cannot 
be started on Unix because of such problems as bad permissions,
bad shebang line, etc.

Some minor points:

If mod_ext_filter debug is enabled, we go ahead and burn cycles
in the parent to try to discover when we won't be able to exec
the script.

The mod_cgid handler wasn't communicating the right log level to the
daemon; that was required to get the child errfn to spit out the
right message, and it may fix an existing problem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98630 13f79535-47bb-0310-9956-ffa450edef68
 2003-02-12 18:27:37 +00:00