You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2001/08/13 19:09:42 UTC
cvs commit: apache-1.3/src/include httpd.h
bnicholes 01/08/13 10:09:42
Modified: src/include httpd.h
Log:
Redefined ap_http_method(r) to ap_os_http_method(r) for NetWare so that
we can appropriately recontruct the URL in ap_contruct_url() based on a
secure or unsecure socket.
Revision Changes Path
1.344 +4 -0 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- httpd.h 2001/05/15 16:30:57 1.343
+++ httpd.h 2001/08/13 17:09:42 1.344
@@ -141,7 +141,11 @@
#define DEFAULT_HTTP_PORT 80
#define DEFAULT_HTTPS_PORT 443
#define ap_is_default_port(port,r) ((port) == ap_default_port(r))
+#ifdef NETWARE
+#define ap_http_method(r) ap_os_http_method(r)
+#else
#define ap_http_method(r) "http"
+#endif
#define ap_default_port(r) DEFAULT_HTTP_PORT
/* --------- Default user name and group name running standalone ---------- */
Re: cvs commit: apache-1.3/src/include httpd.h
Posted by "Roy T. Fielding" <fi...@ebuilt.com>.
On Mon, Aug 13, 2001 at 05:09:42PM -0000, bnicholes@apache.org wrote:
> bnicholes 01/08/13 10:09:42
>
> Modified: src/include httpd.h
> Log:
> Redefined ap_http_method(r) to ap_os_http_method(r) for NetWare so that
> we can appropriately recontruct the URL in ap_contruct_url() based on a
> secure or unsecure socket.
-1. This has nothing to do with the OS. If you need the functionality,
get the patch from Apache-SSL and apply the common part of it such that this
will work for all platforms and all SSL modules. And change the name to
ap_server_url_scheme (or something else that doesn't contradict the HTTP
specification).
DO NOT make changes to functionality in 1.3 without posting them to the
mailing list first for vote an approval.
....Roy
Re: cvs commit: apache-1.3/src/include httpd.h
Posted by Ryan Bloom <rb...@covalent.net>.
Doesn't this change how Apache works depending on which platform you
are on?
I dislike putting SSL into the server on just one platform for Apache 1.3. IMO,
this should be done with a patch to the server when NetWare distributes it, not
with a modification to the core.
Of course, for 2.0, I thoroughly encourage putting this type of thing in. I would
use different logic for 2.0, just because it can be done without #ifdef's.
Ryan
On Monday 13 August 2001 10:09, bnicholes@apache.org wrote:
> bnicholes 01/08/13 10:09:42
>
> Modified: src/include httpd.h
> Log:
> Redefined ap_http_method(r) to ap_os_http_method(r) for NetWare so that
> we can appropriately recontruct the URL in ap_contruct_url() based on a
> secure or unsecure socket.
>
> Revision Changes Path
> 1.344 +4 -0 apache-1.3/src/include/httpd.h
>
> Index: httpd.h
> ===================================================================
> RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
> retrieving revision 1.343
> retrieving revision 1.344
> diff -u -r1.343 -r1.344
> --- httpd.h 2001/05/15 16:30:57 1.343
> +++ httpd.h 2001/08/13 17:09:42 1.344
> @@ -141,7 +141,11 @@
> #define DEFAULT_HTTP_PORT 80
> #define DEFAULT_HTTPS_PORT 443
> #define ap_is_default_port(port,r) ((port) == ap_default_port(r))
> +#ifdef NETWARE
> +#define ap_http_method(r) ap_os_http_method(r)
> +#else
> #define ap_http_method(r) "http"
> +#endif
> #define ap_default_port(r) DEFAULT_HTTP_PORT
>
> /* --------- Default user name and group name running standalone
> ---------- */
--
______________________________________________________________
Ryan Bloom rbb@apache.org
Covalent Technologies rbb@covalent.net
--------------------------------------------------------------
Re: cvs commit: apache-1.3/src/include httpd.h
Posted by Ryan Bloom <rb...@covalent.net>.
Doesn't this change how Apache works depending on which platform you
are on?
I dislike putting SSL into the server on just one platform for Apache 1.3. IMO,
this should be done with a patch to the server when NetWare distributes it, not
with a modification to the core.
Of course, for 2.0, I thoroughly encourage putting this type of thing in. I would
use different logic for 2.0, just because it can be done without #ifdef's.
Ryan
On Monday 13 August 2001 10:09, bnicholes@apache.org wrote:
> bnicholes 01/08/13 10:09:42
>
> Modified: src/include httpd.h
> Log:
> Redefined ap_http_method(r) to ap_os_http_method(r) for NetWare so that
> we can appropriately recontruct the URL in ap_contruct_url() based on a
> secure or unsecure socket.
>
> Revision Changes Path
> 1.344 +4 -0 apache-1.3/src/include/httpd.h
>
> Index: httpd.h
> ===================================================================
> RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
> retrieving revision 1.343
> retrieving revision 1.344
> diff -u -r1.343 -r1.344
> --- httpd.h 2001/05/15 16:30:57 1.343
> +++ httpd.h 2001/08/13 17:09:42 1.344
> @@ -141,7 +141,11 @@
> #define DEFAULT_HTTP_PORT 80
> #define DEFAULT_HTTPS_PORT 443
> #define ap_is_default_port(port,r) ((port) == ap_default_port(r))
> +#ifdef NETWARE
> +#define ap_http_method(r) ap_os_http_method(r)
> +#else
> #define ap_http_method(r) "http"
> +#endif
> #define ap_default_port(r) DEFAULT_HTTP_PORT
>
> /* --------- Default user name and group name running standalone
> ---------- */
--
______________________________________________________________
Ryan Bloom rbb@apache.org
Covalent Technologies rbb@covalent.net
--------------------------------------------------------------