1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Commit Graph

126 Commits

Author SHA1 Message Date
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
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
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
67dd4b3f9c Fix a few warnings about use of uninitialized values.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1143193 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 20:24:33 +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
William A. Rowe Jr
8e5e0e8085 Prevent future developers from being as easily confused; prefix the
registered callback function names with regfnXxx.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@919543 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 19:09:46 +00:00
Jeff Trawick
323d05a480 revert r918671; these four functions don't need to be
addressible except via the function pointers in the
EXTENSION_CONTROL_BLOCK


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@919531 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 18:30:20 +00:00
Jeff Trawick
bb70f0e3b9 follow up to r918665:
These particular functions can't be static because they're 
part of ISAPI, so use a different mechanism to quiet the gcc 
warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@918671 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 20:10:26 +00:00
Jeff Trawick
bdcc35c8f3 fix these warnings:
mod_isapi.c:488: warning: no previous prototype for ‘GetServerVariable’
mod_isapi.c:590: warning: no previous prototype for ‘ReadClient’
mod_isapi.c:807: warning: no previous prototype for ‘WriteClient’
mod_isapi.c:863: warning: no previous prototype for ‘ServerSupportFunction’
mod_isapi.c:1407: warning: no previous prototype for ‘isapi_handler’



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@918665 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 19:49:41 +00:00
William A. Rowe Jr
1ea89a333a SECURITY: CVE-2010-0425 (cve.mitre.org)
mod_isapi: Do not unload an isapi .dll module until the request
processing is completed, avoiding orphaned callback pointers.

Submitted by: Brett Gervasoni <brettg senseofsecurity.com>, trawick
Reviewed by: trawick, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@917870 13f79535-47bb-0310-9956-ffa450edef68
2010-03-02 04:30:33 +00:00
William A. Rowe Jr
cdfe83543d Correctly evaluate the HTTPS condition string.
PR: 40573
Submitted by: Matt Eaton <asf divinehawk.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@492341 13f79535-47bb-0310-9956-ffa450edef68
2007-01-03 23:03:20 +00:00
William A. Rowe Jr
0a56817cb9 Where any response is sent, return OK from the handler. Where there
is no response (but a status code) return the code.  This patch adds
  a great number of debugging emits for failed ap_pass_brigade calls,
  to help diagnose failure cases, and disambiguates OK from APR_SUCCESS. 

PR: 40470
Submitted by: wrowe, Matt Eaton <asf divinehawk.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@492333 13f79535-47bb-0310-9956-ffa450edef68
2007-01-03 22:53:43 +00:00
William A. Rowe Jr
1602c1ffe1 Revert a regression introduced in the recent overhauls of mod_isapi.
PR 40470 points out that we no longer handle ate == headlen, where
there is a headers-only response from the isapi app to the server.

This patch restores the previous behavior of pending those headers
until some amount of body response is ready to be sent to the client.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@483613 13f79535-47bb-0310-9956-ffa450edef68
2006-12-07 19:18:30 +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
William A. Rowe Jr
c231424e83 Solve 416291, but in a more elegant manner, and with a little
more attention to clearing the subreq and determining that
  an r->filename existed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@416293 13f79535-47bb-0310-9956-ffa450edef68
2006-06-22 08:25:19 +00:00
William A. Rowe Jr
cb6b3dac93 Stop appending a backslash if some trailing slash is present.
For cross platform isapi we aught to find out what to add from
  apr, slash or backslash, but can't think of the trivial answer 
  at this hour.

PR: 15993

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@416291 13f79535-47bb-0310-9956-ffa450edef68
2006-06-22 08:00:40 +00:00
William A. Rowe Jr
ab12f700e2 mod_isapi: Handle "HTTP/1.1 200 OK" style status lines correctly, the
token parser worked while the resulting length was misinterpreted.
  We were also off by one in apr_cpystrn which demands room for the
  trailing null be counted.

PR: 29098 
Submitted by: Brock Bland <bbland serena.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@416288 13f79535-47bb-0310-9956-ffa450edef68
2006-06-22 07:13:56 +00:00
William A. Rowe Jr
af85938340 We need to pay alot more attention here to ap_pass_brigade.
PR 30022


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@416278 13f79535-47bb-0310-9956-ffa450edef68
2006-06-22 07:03:29 +00:00
William A. Rowe Jr
61e25cc07a mod_isapi: Ensure we walk through all the methods the developer may have
employed to report their HTTP status result code.

PR: 16637, 30033
Submitted by: Matt Lewandowsky <matt iamcode.net>
Reviewed by: William Rowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@416272 13f79535-47bb-0310-9956-ffa450edef68
2006-06-22 06:46:39 +00:00
Joe Orton
c13f8dd6eb * server/core.c (default_handler): Use apr_brigade_insert_file() to
append the file to the brigade.

* server/protocol.c (ap_send_fd),
modules/proxy/mod_proxy_http.c (spool_reqbody_cl), 
modules/cache/mod_mem_cache.c (recall_body),
modules/cache/mod_disk_cache.c (recall_body),
modules/mappers/mod_negotiation.c (handle_map_file),
modules/generators/mod_asis.c (asis_handler),
modules/dav/fs/repos.c [DEBUG_GET_HANDLER] (dav_fs_deliver),
modules/arch/win32/mod_isapi.c (ServerSupportFunction): Likewise.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@414238 13f79535-47bb-0310-9956-ffa450edef68
2006-06-14 13:16:29 +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
William A. Rowe Jr
7126d1d227 Eliminate last win32-isms, SetLastError becomes apr's set_os_error
operation.  It unfolds the error code on win32, so we have to pre-fold it.
  On unix there is no folding.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386821 13f79535-47bb-0310-9956-ffa450edef68
2006-03-18 07:43:07 +00:00
William A. Rowe Jr
f732ed1f47 Escape from casting purgatory, which the Solaris cc compiler
will not treat as lvalues.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386790 13f79535-47bb-0310-9956-ffa450edef68
2006-03-18 02:14:45 +00:00
William A. Rowe Jr
6b45e585a0 Unsure why win32 never noticed this, but the value returned is a const char*
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@384731 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 08:58:56 +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
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:05:51 +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
Jeff Trawick
81d57e7d39 mod_isapi: GetServerVariable returned improperly terminated header
fields given "ALL_HTTP" or "ALL_RAW".

PR:		20656
Submitted by:	Jesse Pelton <jsp pkc.com>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102643 13f79535-47bb-0310-9956-ffa450edef68
2004-02-16 17:57:26 +00:00
Jeff Trawick
a13b194535 mod_isapi: send_response_header() failed to copy status string's
last character.

PR:		20619
Submitted by:	Jesse Pelton <jsp pkc.com>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102642 13f79535-47bb-0310-9956-ffa450edef68
2004-02-16 17:50:29 +00:00
Jeff Trawick
7421861206 mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer
size.

PR:              20617
Submitted by:	 Jesse Pelton <jsp pkc.com>
Reviewed by:	 Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102641 13f79535-47bb-0310-9956-ffa450edef68
2004-02-16 17:39:56 +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
f45372eda7 fix copyright dates according to the first checkin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102555 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 11:24:12 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +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
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
William A. Rowe Jr
eb7fb37232 Confirmed by Milan Kosina that this code was still broken - I realized
we weren't updating stat correctly, and shouldn't have been trying to
  pass the status, but the headers instead, from WriteClient().  This way
  we can actually count the bytes consumed and begin treating the rest
  as body contents.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98793 13f79535-47bb-0310-9956-ffa450edef68
2003-02-25 16:52:55 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
William A. Rowe Jr
16a2d1c332 Allow headers (if not already passed by other means) to be sent via
WriteFile() since the foxisapi and other thunks seem to indicate that
  headers within the WriteFile() operation are expected to succeed.

  Also assure that all ->completion callbacks get the original size of
  the document.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98533 13f79535-47bb-0310-9956-ffa450edef68
2003-01-29 16:02:17 +00:00
William A. Rowe Jr
c7abede89f Fix several cut 'n paste errors identified by Juergen Heckel.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97481 13f79535-47bb-0310-9956-ffa450edef68
2002-11-11 05:58:39 +00:00
William A. Rowe Jr
8aa559b3d4 Stop unsetting the 'empty' query string result with
a NULL argument in ecb->lpszQueryString, eliminating segfaults
  for some ISAPI modules.

PR: 14399
Submitted by:	Detlev Vendt <detlev.vendt@brillit.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97468 13f79535-47bb-0310-9956-ffa450edef68
2002-11-09 19:20:33 +00:00
William A. Rowe Jr
44b7872ad9 mod_isapi: Fix an issue where HSE_REQ_DONE_WITH_SESSION notification
is received before the HttpExtensionProc() returns HSE_STATUS_PENDING.
  [John DeSetto <jdesetto@radiantsystems.com>, William Rowe]

PR: 11918


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97467 13f79535-47bb-0310-9956-ffa450edef68
2002-11-09 19:10:15 +00:00
William A. Rowe Jr
91f7c5efc7 Fix for PR 10216 ... we should not return the status unless we want the
core to ap_die for us.  If we've handled the response (as determined
  by a new response_sent flag) then the server does not need to do so.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97389 13f79535-47bb-0310-9956-ffa450edef68
2002-11-04 13:44:30 +00:00
William A. Rowe Jr
fb63c7872f The documentation says: ISAPIReadAheadBuffer defaults to 49152 bytes,
which is exactly 48 kb. But the module actually uses a default of 48192
  bytes. This seems to be a typo. Instead of changing the documentation I
  attached a patch for mod_isapi.c to set the default value of
  ISAPIReadAheadBuffer to 49152.

Submitted by: Astrid Ke�ler <kess@kess-net.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96534 13f79535-47bb-0310-9956-ffa450edef68
2002-08-26 20:16:33 +00:00
William A. Rowe Jr
0ecf0cce28 A half hour to waste waiting for builds... this is what you get.
mod_isapi will build and run on OSX... presume others as well unless
  I choose some awful errno values for portability.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96136 13f79535-47bb-0310-9956-ffa450edef68
2002-07-21 09:19:19 +00:00
Justin Erenkrantz
001b387bcd Change conn_rec->keepalive to an enumerated value of
AP_CONN_UNKNOWN
AP_CONN_CLOSE
AP_CONN_KEEPALIVE

This also fixes a problem where ap_discard_request_body would not discard
the body when keepalive was 0.  This actually meant the keepalive status
was unknown *not* closed, but no one ever remembered that.

This problem was seen with mod_dav sending error responses (as reported by
Karl Fogel).

Suggested by:	Greg "this isn't the '80s" Stein
Reviewed by:	Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95891 13f79535-47bb-0310-9956-ffa450edef68
2002-06-26 19:45:07 +00:00
William A. Rowe Jr
5cf5552b11 Use lowercased macros
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95620 13f79535-47bb-0310-9956-ffa450edef68
2002-06-12 22:27:37 +00:00
William A. Rowe Jr
271ee8497b Use the new APR_TIME_FROM_SEC() wrapper
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95616 13f79535-47bb-0310-9956-ffa450edef68
2002-06-12 16:56:27 +00:00
William A. Rowe Jr
7c3e505cd5 Feedback appreciated - I'm guessing that we can trust the isapi app
opened file handles correctly for the TransmitFile case.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95498 13f79535-47bb-0310-9956-ffa450edef68
2002-06-04 02:21:36 +00:00
William A. Rowe Jr
9b8c53f816 Solve a bug identified by Sebastian that we would always reaquire the
lock immediately instead of stalling for the isapi module's thread
  to complete its work.  This requires the new changes to thread_mutex
  that introduce a guarenteed APR_THREAD_MUTEX_UNNESTED flag.

Reported by: Sebastian Hantsch <Sebastian.Hantsch@t-online.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95366 13f79535-47bb-0310-9956-ffa450edef68
2002-05-29 21:23:03 +00:00
William A. Rowe Jr
fde539cb29 Bug one of two, INIT_FLAG better pair with set_flag_slot.
Submitted by:	Sebastian Hantsch <Sebastian.Hantsch@t-online.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95280 13f79535-47bb-0310-9956-ffa450edef68
2002-05-25 15:31:27 +00:00