head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2010Q2:1.1.0.36
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.34
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.32
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.30
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.28
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.26
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.24
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.22
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.20
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.18
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.16
	pkgsrc-2008Q1:1.1.0.14
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.12
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.10
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.8
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.6
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.4
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.2
	pkgsrc-2006Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2010.07.11.12.18.55;	author obache;	state dead;
branches;
next	1.1;

1.1
date	2006.09.24.15.40.24;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update cherokee to 1.0.5.
Based on PR#43557 by Wen Heping.

Bump to 1.x release.
@
text
@$NetBSD: patch-ac,v 1.1 2006/09/24 15:40:24 joerg Exp $

--- cherokee/read_config_grammar.y.orig	2006-09-24 17:26:21.000000000 +0000
+++ cherokee/read_config_grammar.y
@@@@ -440,7 +440,7 @@@@ yyerror (char* msg)
 
 
 %token T_QUOTE T_DENY T_THREAD_NUM T_SSL_CERT_KEY_FILE T_SSL_CERT_FILE T_KEEPALIVE_MAX_REQUESTS T_ERROR_HANDLER
-%token T_TIMEOUT T_KEEPALIVE T_DOCUMENT_ROOT T_LOG T_MIME_FILE T_DIRECTORY T_HANDLER T_USER T_GROUP T_POLICY
+%token T_TIMEOUT T_KEEPALIVE T_DOCUMENT_ROOT T_LOG T_MIME_FILE T_DIRECTORY T_HANDLER T_USER_ T_GROUP T_POLICY
 %token T_SERVER T_USERDIR T_PIDFILE T_LISTEN T_SERVER_TOKENS T_ENCODER T_ALLOW T_DIRECTORYINDEX 
 %token T_ICONS T_AUTH T_NAME T_METHOD T_PASSWDFILE T_SSL_CA_LIST_FILE T_FROM T_SOCKET T_LOG_FLUSH_INTERVAL
 %token T_HEADERFILE T_PANIC_ACTION T_JUST_ABOUT T_LISTEN_QUEUE_SIZE T_SENDFILE T_MINSIZE T_MAXSIZE T_MAX_FDS
@@@@ -1059,7 +1059,7 @@@@ ipv6 : T_IPV6 T_NUMBER
 	   SRV(server)->ipv6 = $2;
 };
 
-user1 : T_USER T_ID
+user1 : T_USER_ T_ID
 {
 	   struct passwd *pwd;
 	   
@@@@ -1074,7 +1074,7 @@@@ user1 : T_USER T_ID
 	   free ($2);
 };
 
-user2 : T_USER T_NUMBER
+user2 : T_USER_ T_NUMBER
 {
 	   SRV(server)->user = $2;
 };
@@@@ -1702,7 +1702,7 @@@@ auth_option : T_NAME T_QSTRING 
 	   free ($2);
 };
 
-auth_option : T_USER id_list
+auth_option : T_USER_ id_list
 {
 	   linked_list_t *i;
 
@


1.1
log
@Rename T_USER to not conflict with system enum on DragonFly and FreeBSD.
@
text
@d1 1
a1 1
$NetBSD$
@