tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c
Date Wed, 13 Nov 2002 00:21:21 GMT
costin      2002/11/12 16:21:20

  Modified:    jk/native2/common jk_uriEnv.c
  Log:
  Remove the deprecated message for path.
  
  It is used by the 'native' apache2 mapper.
  
  Revision  Changes    Path
  1.41      +12 -15    jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
  
  Index: jk_uriEnv.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- jk_uriEnv.c	22 Oct 2002 10:11:44 -0000	1.40
  +++ jk_uriEnv.c	13 Nov 2002 00:21:20 -0000	1.41
  @@ -226,22 +226,26 @@
               uriEnv->aliases->put(env, uriEnv->aliases, val, uriEnv, NULL);
           }
       }
  +    else if (strcmp("path", name) == 0) {
  +        /** This is called from Location in jk2, it has the same effect
  +         *    as using the constructor.
  +         */
  +        if (val == NULL)
  +            uriEnv->uri = NULL;
  +        else
  +            uriEnv->uri = uriEnv->pool->pstrdup(env, uriEnv->pool, val);
  +    }
       else if (strcmp("inheritGlobals", name) == 0) {
           uriEnv->inherit_globals = atoi(val);
       }
       else {
           /* OLD - DEPRECATED */
  -        int d = 1;
           if (strcmp("worker", name) == 0) {
  -            d = 1;
               uriEnv->workerName = val;
  +            env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                    "uriEnv.setAttribute() the %s directive is deprecated. Use 'group'
instead.\n",
  +                    name);
           } 
  -        else if (strcmp("path", name) == 0) {
  -            if (val == NULL)
  -                uriEnv->uri = NULL;
  -            else
  -                uriEnv->uri = uriEnv->pool->pstrdup(env, uriEnv->pool, val);
  -        }
           else if (strcmp("uri", name) == 0) {
               jk2_uriEnv_parseName(env, uriEnv, val);
           } 
  @@ -254,13 +258,6 @@
               else
                   uriEnv->virtual = uriEnv->pool->pstrdup(env, uriEnv->pool,
val);
           }
  -        else
  -            d = 0;
  -        if (d)
  -            env->l->jkLog(env, env->l, JK_LOG_INFO,
  -                    "uriEnv.setAttribute() the %s directive is depriciated\n",
  -                    name);
  -        
       }
       return JK_OK;
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message