Commit 651263e2 authored by Andre Malo's avatar Andre Malo
Browse files

remove "support" for Remote_User variable, which never worked at all. 

PR: 25725
Reviewed by: Justin Erenkrantz, Paul Querna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104736 13f79535-47bb-0310-9956-ffa450edef68
parent f96ae82d

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.51









  *) mod_setenvif: Remove "support" for Remote_User variable which









     never worked at all. PR 25725.  [André Malo]

















  *) Backport from 2.1 / Regression from 1.3: mod_headers now knows









     again the functionality of the ErrorHeader directive. But instead









     using this misnomer additional flags to the Header directive were


































STATUS



+1
−6



























Changes for STATUS: 1 added line, 6 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/08/19 22:53:12 $]









Last modified at [$Date: 2004/08/19 23:29:40 $]



















Release:




















@@ -275,11 +275,6 @@ PATCHES TO BACKPORT FROM 2.1







       -0: jerenkrantz (should wait for 2.2)









       -0: jorton (msgid <20040305083540.GA24529@redhat.com>)



















    * mod_setenvif: remove support for remote_user variable which never









      worked at all. PR 25725 (2.0 + 1.3)









        modules/metadata/mod_setenvif.c: r1.50









      +1: nd, jerenkrantz, pquerna



















    * Replace some of the mutex locking in the worker MPM with









      atomic operations for higher concurrency.









      server/mpm/worker/fdqueue.c 1.24, 1.25


































docs/manual/mod/mod_setenvif.xml



+1
−4



























Changes for docs/manual/mod/mod_setenvif.xml: 1 added line, 4 removed lines.



Original line number
Diff line number
Diff line









<?xml version="1.0"?>









<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">









<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>









<!-- $Revision: 1.7.2.5 $ -->









<!-- $Revision: 1.7.2.6 $ -->



















<!--









 Copyright 2002-2004 The Apache Software Foundation










@@ -157,9 +157,6 @@ respect to case</description>







      on which the request was received (only with versions later









      than 2.0.43)</li>



















      <li><code>Remote_User</code> - the authenticated username (if









      available)</li>



















      <li><code>Request_Method</code> - the name of the method









      being used (<code>GET</code>, <code>POST</code>, <em>et









      cetera</em>)</li>


































modules/metadata/mod_setenvif.c



+0
−8



























Changes for modules/metadata/mod_setenvif.c: 0 added lines, 8 removed lines.



Original line number
Diff line number
Diff line







@@ -53,7 +53,6 @@







 *			(analogous to SERVER_ADDR set in ap_add_common_vars())









 *   remote_host        Remote host name (if available)









 *   remote_addr        Remote IP address









 *   remote_user        Remote authenticated user (if any)









 *   request_method     Request method (GET, POST, etc)









 *   request_uri        Requested URI









 *










@@ -99,7 +98,6 @@ enum special {







    SPECIAL_NOT,









    SPECIAL_REMOTE_ADDR,









    SPECIAL_REMOTE_HOST,









    SPECIAL_REMOTE_USER,









    SPECIAL_REQUEST_URI,









    SPECIAL_REQUEST_METHOD,









    SPECIAL_REQUEST_PROTOCOL,










@@ -334,9 +332,6 @@ static const char *add_setenvif_core(cmd_parms *cmd, void *mconfig,







        else if (!strcasecmp(fname, "remote_host")) {









            new->special_type = SPECIAL_REMOTE_HOST;









        }









        else if (!strcasecmp(fname, "remote_user")) {









            new->special_type = SPECIAL_REMOTE_USER;









        }









        else if (!strcasecmp(fname, "request_uri")) {









            new->special_type = SPECIAL_REQUEST_URI;









        }










@@ -493,9 +488,6 @@ static int match_headers(request_rec *r)







                val =  ap_get_remote_host(r->connection, r->per_dir_config,









                                          REMOTE_NAME, NULL);









                break;









            case SPECIAL_REMOTE_USER:









                val = r->user;









                break;









            case SPECIAL_REQUEST_URI:









                val = r->uri;









                break;