www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
16,115 Commits 62 Branches 313 Tags
httpd-pid-table
Commit Graph

209 Commits

Author SHA1 Message Date
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
Jeff Trawick
743a621e8d Replace ap_get_server_version with ap_get_server_banner() and 
ap_get_server_description().

High-level summary:

The full server version information is now included in the error log at
startup as well as server status reports, irrespective of the setting
of the ServerTokens directive.

Third-party modules must now use ap_get_server_banner() or 
ap_get_server_description() in place of ap_get_server_version().



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440337 13f79535-47bb-0310-9956-ffa450edef68
 2006-09-05 13:08:15 +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
Bradley Nicholes
6e46c67f1e Fix a problem with the HTTPS CGI variable not getting set for secure requests. Needed to readd the port and address on every restart whether or not the listen port is being created or resused. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@348014 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-21 23:25:44 +00:00
Jim Jagielski
08c97ba290 No functional change: remove "internal" tab spacing/formatting. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-16 16:31:25 +00:00
Jim Jagielski
b72e610410 No functional change: more indenting/formatting changes due to 
tabbing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 16:03:23 +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
Bradley Nicholes
6905d3d9d5 Allow httpd on NetWare to build using either the standard socket libraries or the Winsock libraries. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161368 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-14 23:42:21 +00:00
Bradley Nicholes
bb35e2f831 Make sure that the secure listen sockets that are created and injected into the ap_listeners lists by mod_nw_ssl are handled correctly so that they remain open and reused across restarts. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156556 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-08 18:09:43 +00:00
William A. Rowe Jr
8dfeff7595 Ignore both PATH_INFO as well as PATH_TRANSLATED to avoid hiccups 
from additional path information passed in non-utf-8 format.

Submitted by: Richard Donkin <rd9 donkin.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151464 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-05 01:41:52 +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
William A. Rowe Jr
459b02f136 Handle PATH_INFO as opaque byte-wise data for cgi invocation as 
handled for other variables with bug 9223.

PR: 32730
Submitted by: Richard Donkin <rd9 donkin.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124556 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-07 18:29:13 +00:00
William A. Rowe Jr
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME! 
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-02 05:33:44 +00:00
Bradley Nicholes
559d71ed95 * modules/arch/netware/mod_nw_ssl.c (ssl_io_filter_Upgrade): Simplify the 
Upgrade header check; allow upgrades on any method; don't drop the
ap_pass_brigade return value.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111327 13f79535-47bb-0310-9956-ffa450edef68
 2004-12-08 23:22:09 +00:00
Bradley Nicholes
8baaa0a27f Fixing various compiler error when compiling against the latest version of LibC SDK 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106766 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-27 22:50:18 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-19 09:07:29 +00:00
Bradley Nicholes
d68780ff93 Add the check for an upgraded https connection when responding to the state of a connection 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105606 13f79535-47bb-0310-9956-ffa450edef68
 2004-10-27 15:14:51 +00:00
Bradley Nicholes
8a0ce65f9a Track the status of an upgradeable socket so that the http_method and default_port hooks will report the correct information. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105458 13f79535-47bb-0310-9956-ffa450edef68
 2004-10-14 17:10:30 +00:00
Allan K. Edwards
4abcf93fc2 WIN64: fix some windows specific 64bit warnings 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105390 13f79535-47bb-0310-9956-ffa450edef68
 2004-10-06 13:33:29 +00:00
Bradley Nicholes
000813a1f3 Allow multiple IP addresses to be configured for the same secure port 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104802 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-25 19:13:28 +00:00
Bradley Nicholes
ccbcd569a7 Add the new directive NWSSLUpgradeable to mod_nw_ssl to allow a non-secure connection to be upgraded to secure connections 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104278 13f79535-47bb-0310-9956-ffa450edef68
 2004-07-13 19:30:58 +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
Jean-Jacques Clar
a2c057d7fb Replaced APR_PROGRAM_ENV with new enum APR_PROGRAM_ADDRSPACE 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103914 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-11 20:21:04 +00:00
Bradley Nicholes
61f52655fd The code was truncating the parameters for all NLM level commands. Needed to make sure that all of the parameters are being passed to the argv parser. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103052 13f79535-47bb-0310-9956-ffa450edef68
 2004-03-20 04:17:26 +00:00
Bradley Nicholes
2e0569de3d Report the NetWare socket error since we are using native socket calls 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102986 13f79535-47bb-0310-9956-ffa450edef68
 2004-03-16 02:49:15 +00:00
Bradley Nicholes
fb318cf248 Add the ssl_is_https() and ssl_var_lookup() optional functions to the mod_nw_ssl module for Netware 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102877 13f79535-47bb-0310-9956-ffa450edef68
 2004-03-07 03:08:21 +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