Commit 3f938689 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Resolve three files mis-committed in r396974

  (Damn I swear these didn't appear in svn status :(  -  the next
  commit to mod_ssl.dsp will spare everyone this mistake in the future.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396980 13f79535-47bb-0310-9956-ffa450edef68
parent 4ab74a12

modules/ssl/ssl_expr_parse.c

+439 −910

File changed.

Preview size limit exceeded, changes collapsed.

modules/ssl/ssl_expr_parse.h

+8 −6
Changes for modules/ssl/ssl_expr_parse.h: 8 added lines, 6 removed lines.
Original line number Diff line number Diff line 
typedef union {

    char     *cpVal;

    ssl_expr *exVal;

} YYSTYPE;

#ifndef YYERRCODE

#define YYERRCODE 256

#endif



#define T_TRUE 257

#define T_FALSE 258

#define T_DIGIT 259
@@ -23,6 +23,8 @@ typedef union { 
#define T_OP_OR 275

#define T_OP_AND 276

#define T_OP_NOT 277





typedef union {

    char     *cpVal;

    ssl_expr *exVal;

} YYSTYPE;

extern YYSTYPE ssl_expr_yylval;

modules/ssl/ssl_expr_scan.c

+4 −3
Changes for modules/ssl/ssl_expr_scan.c: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
/* A lexical scanner generated by flex */



/* Scanner skeleton version:

 * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.4 1999/10/27 07:56:44 obrien Exp $

 */



#define FLEX_SCANNER
@@ -499,7 +500,7 @@ int yyinput(char *buf, int max_size); 
#define regex 2

#define regex_flags 3



#line 504 "lex.ssl_expr_yy.c"

#line 505 "lex.ssl_expr_yy.c"



/* Macros after this point can all be overridden by user definitions in

 * section 1.
@@ -662,7 +663,7 @@ YY_DECL 
 /*

  * Whitespaces

  */

#line 667 "lex.ssl_expr_yy.c"

#line 668 "lex.ssl_expr_yy.c"



        if ( yy_init )

                {
@@ -1067,7 +1068,7 @@ YY_RULE_SETUP 
#line 212 "ssl_expr_scan.l"

YY_FATAL_ERROR( "flex scanner jammed" );

        YY_BREAK

#line 1072 "lex.ssl_expr_yy.c"

#line 1073 "lex.ssl_expr_yy.c"

case YY_STATE_EOF(INITIAL):

case YY_STATE_EOF(str):

case YY_STATE_EOF(regex):