httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_expr_scan.c
Date Mon, 30 Sep 2002 23:45:58 GMT
rbb         2002/09/30 16:45:58

  Modified:    modules/ssl ssl_expr_scan.c
  Log:
  back out the stuff from mod_ssl that shouldn't have been committed.
  
  /me wonders why we have generated content in CVS.    :-(
  
  Revision  Changes    Path
  1.12      +54 -53    httpd-2.0/modules/ssl/ssl_expr_scan.c
  
  Index: ssl_expr_scan.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_expr_scan.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ssl_expr_scan.c	30 Sep 2002 23:43:18 -0000	1.11
  +++ ssl_expr_scan.c	30 Sep 2002 23:45:58 -0000	1.12
  @@ -18,6 +18,7 @@
   /* A lexical scanner generated by flex */
   
   /* Scanner skeleton version:
  + * $Header$
    */
   
   #define FLEX_SCANNER
  @@ -57,8 +58,8 @@
   #endif	/* ! __cplusplus */
   
   #ifdef __TURBOC__
  - #pragma warn -rch
  - #pragma warn -use
  +#pragma warn -rch
  +#pragma warn -use
   #include <io.h>
   #include <stdlib.h>
   #define YY_USE_CONST
  @@ -443,7 +444,7 @@
   #define YY_MORE_ADJ 0
   #define YY_RESTORE_YY_MORE_OFFSET
   char *yytext;
  -#line 1 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 1 "ssl_expr_scan.l"
   #define INITIAL 0
   /*                      _             _ 
   **  _ __ ___   ___   __| |    ___ ___| |  
  @@ -510,7 +511,7 @@
   **  Expression Scanner
   **  _________________________________________________________________
   */
  -#line 70 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 70 "ssl_expr_scan.l"
   #include "mod_ssl.h"
   
   #include "ssl_expr_parse.h"
  @@ -681,7 +682,7 @@
   	register char *yy_cp, *yy_bp;
   	register int yy_act;
   
  -#line 91 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 91 "ssl_expr_scan.l"
   
     
     char  caStr[MAX_STR_LEN];
  @@ -774,7 +775,7 @@
   
   case 1:
   YY_RULE_SETUP
  -#line 102 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 102 "ssl_expr_scan.l"
   { 
       /* NOP */
   }
  @@ -784,7 +785,7 @@
     */
   case 2:
   YY_RULE_SETUP
  -#line 109 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 109 "ssl_expr_scan.l"
   {
       cpStr = caStr;
       BEGIN(str);
  @@ -792,7 +793,7 @@
   	YY_BREAK
   case 3:
   YY_RULE_SETUP
  -#line 113 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 113 "ssl_expr_scan.l"
   {
       BEGIN(INITIAL);
       *cpStr = NUL;
  @@ -802,14 +803,14 @@
   	YY_BREAK
   case 4:
   YY_RULE_SETUP
  -#line 119 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 119 "ssl_expr_scan.l"
   {
       yyerror("Unterminated string");
   }
   	YY_BREAK
   case 5:
   YY_RULE_SETUP
  -#line 122 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 122 "ssl_expr_scan.l"
   {
       int result;
   
  @@ -822,46 +823,46 @@
   	YY_BREAK
   case 6:
   YY_RULE_SETUP
  -#line 131 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 131 "ssl_expr_scan.l"
   {
       yyerror("Bad escape sequence");
   }
   	YY_BREAK
   case 7:
   YY_RULE_SETUP
  -#line 134 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 134 "ssl_expr_scan.l"
   { *cpStr++ = '\n'; }
   	YY_BREAK
   case 8:
   YY_RULE_SETUP
  -#line 135 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 135 "ssl_expr_scan.l"
   { *cpStr++ = '\r'; }
   	YY_BREAK
   case 9:
   YY_RULE_SETUP
  -#line 136 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 136 "ssl_expr_scan.l"
   { *cpStr++ = '\t'; }
   	YY_BREAK
   case 10:
   YY_RULE_SETUP
  -#line 137 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 137 "ssl_expr_scan.l"
   { *cpStr++ = '\b'; }
   	YY_BREAK
   case 11:
   YY_RULE_SETUP
  -#line 138 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 138 "ssl_expr_scan.l"
   { *cpStr++ = '\f'; }
   	YY_BREAK
   case 12:
   YY_RULE_SETUP
  -#line 139 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 139 "ssl_expr_scan.l"
   {
       *cpStr++ = yytext[1];
   }
   	YY_BREAK
   case 13:
   YY_RULE_SETUP
  -#line 142 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 142 "ssl_expr_scan.l"
   {
       char *cp = yytext;
       while (*cp != NUL)
  @@ -870,7 +871,7 @@
   	YY_BREAK
   case 14:
   YY_RULE_SETUP
  -#line 147 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 147 "ssl_expr_scan.l"
   {
       *cpStr++ = yytext[1];
   }
  @@ -880,7 +881,7 @@
     */
   case 15:
   YY_RULE_SETUP
  -#line 154 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 154 "ssl_expr_scan.l"
   {
       cRegexDel = yytext[1];
       cpRegex = caRegex;
  @@ -889,7 +890,7 @@
   	YY_BREAK
   case 16:
   YY_RULE_SETUP
  -#line 159 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 159 "ssl_expr_scan.l"
   {
       if (yytext[0] == cRegexDel) {
           *cpRegex = NUL;
  @@ -902,7 +903,7 @@
   	YY_BREAK
   case 17:
   YY_RULE_SETUP
  -#line 168 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 168 "ssl_expr_scan.l"
   {
       yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caRegex);
       BEGIN(INITIAL);
  @@ -911,7 +912,7 @@
   	YY_BREAK
   case 18:
   YY_RULE_SETUP
  -#line 173 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 173 "ssl_expr_scan.l"
   {
       yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caRegex);
       yyless(0);
  @@ -920,7 +921,7 @@
   }
   	YY_BREAK
   case YY_STATE_EOF(regex_flags):
  -#line 179 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 179 "ssl_expr_scan.l"
   {
       yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, caRegex);
       BEGIN(INITIAL);
  @@ -932,107 +933,107 @@
     */
   case 19:
   YY_RULE_SETUP
  -#line 188 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 188 "ssl_expr_scan.l"
   { return T_OP_EQ; }
   	YY_BREAK
   case 20:
   YY_RULE_SETUP
  -#line 189 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 189 "ssl_expr_scan.l"
   { return T_OP_EQ; }
   	YY_BREAK
   case 21:
   YY_RULE_SETUP
  -#line 190 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 190 "ssl_expr_scan.l"
   { return T_OP_NE; }
   	YY_BREAK
   case 22:
   YY_RULE_SETUP
  -#line 191 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 191 "ssl_expr_scan.l"
   { return T_OP_NE; }
   	YY_BREAK
   case 23:
   YY_RULE_SETUP
  -#line 192 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 192 "ssl_expr_scan.l"
   { return T_OP_LT; }
   	YY_BREAK
   case 24:
   YY_RULE_SETUP
  -#line 193 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 193 "ssl_expr_scan.l"
   { return T_OP_LT; }
   	YY_BREAK
   case 25:
   YY_RULE_SETUP
  -#line 194 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 194 "ssl_expr_scan.l"
   { return T_OP_LE; }
   	YY_BREAK
   case 26:
   YY_RULE_SETUP
  -#line 195 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 195 "ssl_expr_scan.l"
   { return T_OP_LE; }
   	YY_BREAK
   case 27:
   YY_RULE_SETUP
  -#line 196 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 196 "ssl_expr_scan.l"
   { return T_OP_GT; }
   	YY_BREAK
   case 28:
   YY_RULE_SETUP
  -#line 197 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 197 "ssl_expr_scan.l"
   { return T_OP_GT; }
   	YY_BREAK
   case 29:
   YY_RULE_SETUP
  -#line 198 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 198 "ssl_expr_scan.l"
   { return T_OP_GE; }
   	YY_BREAK
   case 30:
   YY_RULE_SETUP
  -#line 199 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 199 "ssl_expr_scan.l"
   { return T_OP_GE; }
   	YY_BREAK
   case 31:
   YY_RULE_SETUP
  -#line 200 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 200 "ssl_expr_scan.l"
   { return T_OP_REG; }
   	YY_BREAK
   case 32:
   YY_RULE_SETUP
  -#line 201 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 201 "ssl_expr_scan.l"
   { return T_OP_NRE; }
   	YY_BREAK
   case 33:
   YY_RULE_SETUP
  -#line 202 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 202 "ssl_expr_scan.l"
   { return T_OP_AND; }
   	YY_BREAK
   case 34:
   YY_RULE_SETUP
  -#line 203 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 203 "ssl_expr_scan.l"
   { return T_OP_AND; }
   	YY_BREAK
   case 35:
   YY_RULE_SETUP
  -#line 204 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 204 "ssl_expr_scan.l"
   { return T_OP_OR; }
   	YY_BREAK
   case 36:
   YY_RULE_SETUP
  -#line 205 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 205 "ssl_expr_scan.l"
   { return T_OP_OR; }
   	YY_BREAK
   case 37:
   YY_RULE_SETUP
  -#line 206 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 206 "ssl_expr_scan.l"
   { return T_OP_NOT; }
   	YY_BREAK
   case 38:
   YY_RULE_SETUP
  -#line 207 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 207 "ssl_expr_scan.l"
   { return T_OP_NOT; }
   	YY_BREAK
   case 39:
   YY_RULE_SETUP
  -#line 208 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 208 "ssl_expr_scan.l"
   { return T_OP_IN; }
   	YY_BREAK
   /*
  @@ -1040,7 +1041,7 @@
     */
   case 40:
   YY_RULE_SETUP
  -#line 213 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 213 "ssl_expr_scan.l"
   { return T_FUNC_FILE; }
   	YY_BREAK
   /*
  @@ -1048,12 +1049,12 @@
     */
   case 41:
   YY_RULE_SETUP
  -#line 218 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 218 "ssl_expr_scan.l"
   { return T_TRUE; }
   	YY_BREAK
   case 42:
   YY_RULE_SETUP
  -#line 219 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 219 "ssl_expr_scan.l"
   { return T_FALSE; }
   	YY_BREAK
   /*
  @@ -1061,7 +1062,7 @@
     */
   case 43:
   YY_RULE_SETUP
  -#line 224 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 224 "ssl_expr_scan.l"
   {
       yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, yytext);
       return T_DIGIT;
  @@ -1072,7 +1073,7 @@
     */
   case 44:
   YY_RULE_SETUP
  -#line 232 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 232 "ssl_expr_scan.l"
   {
       yylval.cpVal = apr_pstrdup(ssl_expr_info.pool, yytext);
       return T_ID;
  @@ -1083,14 +1084,14 @@
     */
   case 45:
   YY_RULE_SETUP
  -#line 240 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 240 "ssl_expr_scan.l"
   { 
       return yytext[0];
   }
   	YY_BREAK
   case 46:
   YY_RULE_SETUP
  -#line 244 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 244 "ssl_expr_scan.l"
   YY_FATAL_ERROR( "flex scanner jammed" );
   	YY_BREAK
   #line 1098 "lex.ssl_expr_yy.c"
  @@ -1982,7 +1983,7 @@
   	return 0;
   	}
   #endif
  -#line 244 "/home/rbb/httpd-2.0/modules/ssl/ssl_expr_scan.l"
  +#line 244 "ssl_expr_scan.l"
   
   
   int yyinput(char *buf, int max_size)
  
  
  

Mime
View raw message