You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/08/23 23:17:38 UTC

cvs commit: httpd-2.0/modules/arch/win32 mod_isapi.c

wrowe       01/08/23 14:17:38

  Modified:    modules/arch/win32 mod_isapi.c
  Log:
    We already extract e for subprocess_env, and set SECURE_SERVER_PORT
    for real.
  
  Revision  Changes    Path
  1.49      +7 -3      httpd-2.0/modules/arch/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_isapi.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- mod_isapi.c	2001/08/23 18:57:08	1.48
  +++ mod_isapi.c	2001/08/23 21:17:38	1.49
  @@ -352,6 +352,7 @@
       apr_status_t rv;
       isapi_loaded *isa;
       isapi_cid *cid;
  +    const char *val;
       DWORD read;
       int res;
       
  @@ -383,9 +384,12 @@
       /* Set up variables */
       ap_add_common_vars(r);
       ap_add_cgi_vars(r);
  -    apr_table_setn(r->subprocess_env, "UNMAPPED_REMOTE_USER", "REMOTE_USER");
  -    apr_table_setn(r->subprocess_env, "SERVER_PORT_SECURE", "0");
  -    apr_table_setn(r->subprocess_env, "URL", r->uri);
  +    apr_table_setn(e, "UNMAPPED_REMOTE_USER", "REMOTE_USER");
  +    if ((val = apr_table_get(e, "HTTPS")) && strcmp(val, "on"))
  +        apr_table_setn(e, "SERVER_PORT_SECURE", "1");
  +    else
  +        apr_table_setn(e, "SERVER_PORT_SECURE", "0");
  +    apr_table_setn(e, "URL", r->uri);
   
       /* Set up connection structure and ecb */
       cid = apr_pcalloc(r->pool, sizeof(isapi_cid));