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

60 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
a64646fc96 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102553 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 11:20:20 +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
Bradley Nicholes
eaf4e9255a Allow for binary CGI's to have file extensions other than .NLM
Submitted by: G�nter Knauf <gk@gknw.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101989 13f79535-47bb-0310-9956-ffa450edef68
2003-12-04 21:30:09 +00:00
Bradley Nicholes
8e1147717a Hook the default_port so that mod_nw_ssl will return the correct port rather
than defaulting to 80


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101872 13f79535-47bb-0310-9956-ffa450edef68
2003-11-24 20:36:55 +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
Bradley Nicholes
242ebeb98a Allow for an unclean shutdown of SSL ports to avoid timeout conditions
between the client and the server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100138 13f79535-47bb-0310-9956-ffa450edef68
2003-06-02 15:24:30 +00:00
Bradley Nicholes
0b5947ebe8 Allow blind accept when converting the proxy client socket to SSL if no client
certificates have been provided.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99738 13f79535-47bb-0310-9956-ffa450edef68
2003-05-08 16:08:43 +00:00
Bradley Nicholes
f233271ef0 Added the optional ssl_enable functions to allow mod_proxy to hook into
mod_nw_ssl on NetWare.  This allows a unsecure connection to be upgraded
to a secure connection when required by mod_proxy.  Also added the
directive NWSSLTrustedCerts to allow an administrator to provide a list of
certificates used to upgrade the secure connections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99006 13f79535-47bb-0310-9956-ffa450edef68
2003-03-13 23:20:03 +00:00
Bradley Nicholes
cade8abb91 Make sure that the file extension is at least an empty string rather than NULL
so that the table searches will function properly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98635 13f79535-47bb-0310-9956-ffa450edef68
2003-02-12 22:52:32 +00:00
Bradley Nicholes
bda8397614 Make sure the command type defaults to APR_PROGRAM on NetWare for
all CGIs


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98615 13f79535-47bb-0310-9956-ffa450edef68
2003-02-11 23:48:37 +00:00
Bradley Nicholes
302a8374d6 Start all CGIs as detached and allow the APR_PROGRAM_* flags to determine
if the CGI should be started in its own address space.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98613 13f79535-47bb-0310-9956-ffa450edef68
2003-02-11 17:12:01 +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
a2dcb36e87 Just 2c and fix my old borked comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97605 13f79535-47bb-0310-9956-ffa450edef68
2002-11-23 17:57:26 +00:00
William A. Rowe Jr
467916080b On an errno rampage... ap_log_error takes an apr_status_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97341 13f79535-47bb-0310-9956-ffa450edef68
2002-10-29 05:25:51 +00:00
Bradley Nicholes
fa92540532 import the proxy_module system for the NetWare project build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97209 13f79535-47bb-0310-9956-ffa450edef68
2002-10-14 18:42:01 +00:00
William A. Rowe Jr
5a3e3f0e54 A couple of observations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97199 13f79535-47bb-0310-9956-ffa450edef68
2002-10-14 00:12:02 +00:00
Bradley Nicholes
0f87916121 Fixed a problem with the NetWare command line builder for building the CGI
command line.  It did not handle building the command line when given a
script rather than an executible.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97181 13f79535-47bb-0310-9956-ffa450edef68
2002-10-11 17:31:09 +00:00
Bradley Nicholes
4047bee211 Add mod_logio to the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97066 13f79535-47bb-0310-9956-ffa450edef68
2002-10-03 00:26:37 +00:00
Bradley Nicholes
dcec8541b5 Clean up some left over garbage in the NetWare make files after moving the
provider API's into the core.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96931 13f79535-47bb-0310-9956-ffa450edef68
2002-09-20 16:23:38 +00:00
Bradley Nicholes
3b1df81471 NetWare make files and .def to build the new auth modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96790 13f79535-47bb-0310-9956-ffa450edef68
2002-09-13 21:34:27 +00:00
Bradley Nicholes
2098aa68ad NetWare Auth module .def files that are no longer needed due to the new
auth module architecture


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96789 13f79535-47bb-0310-9956-ffa450edef68
2002-09-13 21:31:49 +00:00
Bradley Nicholes
5e52ad101d Fixed the ap_cgi_build_command() function for NetWare so that it correctly
builds both the CGI and SSI command strings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96190 13f79535-47bb-0310-9956-ffa450edef68
2002-07-25 19:06:13 +00:00
Bradley Nicholes
cfd23da1ca Modified the CGIMapExtension directive to take an optional parameter that
specifies how the CGI NLM should be launched.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95590 13f79535-47bb-0310-9956-ffa450edef68
2002-06-10 16:22:36 +00:00
Bradley Nicholes
4291eb89de Consolidated the startup attributes for building the command line for a CGI
binary into a single structure.  This allows platform integrator to manipulate
the startup parameters much more easily.  Also added the detach attribute
so that each CGI binary can be spawn appropriately for the OS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95534 13f79535-47bb-0310-9956-ffa450edef68
2002-06-05 22:58:03 +00:00
Bradley Nicholes
d23f9673bc Added mod_cgi and mod_netware as built in module in the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95445 13f79535-47bb-0310-9956-ffa450edef68
2002-05-31 17:16:09 +00:00
Bradley Nicholes
b82e723ac4 Updated the NetWare import and exports lists for the caching modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94999 13f79535-47bb-0310-9956-ffa450edef68
2002-05-07 17:39:16 +00:00