1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

184 Commits

Author SHA1 Message Date
Christophe Jaillet
56d0c25725 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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612068 13f79535-47bb-0310-9956-ffa450edef68
2014-07-20 09:32:58 +00:00
Christophe Jaillet
af7096d97d s/equivalant/equivalent/ in comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550828 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 19:56:41 +00:00
Eric Covener
ee439edcb1 gratuitous 8-bit char in a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1498200 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 00:18:56 +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
Jeff Trawick
47b58a49e0 definAtely
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1213381 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 19:21:37 +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
2a12b17862 Fix apr_status_t being passed as loglevel
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209741 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:22:51 +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
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
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
Guenter Knauf
8def8313ec Invert logic for env var utf-8 fixing.
Now we exclude a list of vars which we know for sure they
dont hold utf-8 chars; all other vars will be fixed. This
has the benefit that now also all vars from 3rd-party
modules will be fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146932 13f79535-47bb-0310-9956-ffa450edef68
2011-07-15 00:28:39 +00:00
Guenter Knauf
6b72d583d1 Fixed some more env vars which make problems.
This fix is based on BZ 13029 / 34985, and includes
now the SSL_ and GEOIP_ vars; otherwise its impossible
to run CGIs when mod_ssl and/or mod_geoip are loaded
and those mods return UTF-8 chars in any var during a
request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1145647 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 16:13:28 +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
Jeff Trawick
4598f1a7d4 fix some grammar mistakes, mostly in comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-12 00:35:39 +00:00
Guenter Knauf
8753d7e167 Added shebang check so that .vbs scripts can work as CGI.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1054347 13f79535-47bb-0310-9956-ffa450edef68
2011-01-02 04:33:28 +00:00
Guenter Knauf
dbf4a86e3d Fixed some win32 types.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040220 13f79535-47bb-0310-9956-ffa450edef68
2010-11-29 18:33:28 +00:00
Daniel Earl Poirier
6b803976f2 Fix a number of typos and misspellings. Reported by Ville Skytta.
PR48496.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029134 13f79535-47bb-0310-9956-ffa450edef68
2010-10-30 17:56:13 +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
53dd6cf3a2 eliminating 9x legacy code from mod_win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731971 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 15:22:38 +00:00
William A. Rowe Jr
1fc3b01590 Embed the .manifest files of all httpd binaries as a post-build
operation.  This ensures the exported (Studio 97 generated) .mak
files create a usable Apache directly from the VC 8 (Studio 2005)
command line environment.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@495126 13f79535-47bb-0310-9956-ffa450edef68
2007-01-11 05:37:20 +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
6df9b82d20 Revert Revision 397647
While it solves the studio 2005 (we desire this), it breaks
the studio 6 packaging (we require this).  Discussion on list
of practical solutions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419644 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 18:36:23 +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
William A. Rowe Jr
b2820e8da8 This resource /D syntax was pretty horridly imported into VS 2005,
change the quotation to ensure a peaceful transition to sln/vcproj files.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397647 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:41:29 +00:00
William A. Rowe Jr
f65c47bd75 Remove all /machine:I386 references, these are getting in the way
of switching linkers from the x86 (default linker) to x64 or other
  possible target platforms.  (Also, this commit cleans up lingering
  /GX switches from the 'BASE' options that are supposed to be unused).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397407 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 05:30:39 +00:00
William A. Rowe Jr
663687ae8e s|/GX |/EHsc | because they were always synonyms, and Visual Studio
2005 edition complains bitterly and loudly that /GX is deprecated.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395419 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:51:02 +00:00
William A. Rowe Jr
862d0e231e Remove a host of dependencies upon awk, using the same template for
nearly every .rc compilation (giving the output .res file a different
  name for each component).  Adds AP_SERVER_BASEPROJECT to ap_revision.h
  so we can display the proper name of "Apache HTTP Server" as opposed
  to AP_SERVER_BASEPRODUCT (which is, and should remain, simply "Apache"
  for the server string tokens.)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395418 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:47:49 +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
Ian Holsman
8c1e315d3f Doxygen fixup / cleanup
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 23:03:59 +00:00
William A. Rowe Jr
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2).
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00