From: Rafael Sadowski Subject: httpd: make token order more easily extendable To: tech@openbsd.org Cc: Fabien Romano Date: Tue, 14 Jul 2026 09:36:36 +0200 Based on an idea from Fabien Romano. OK? commit f80d390e39c424a047db92a21c99f81bd0bb206c Author: Rafael Sadowski Date: Tue Jul 14 09:33:42 2026 +0200 httpd: make token order more easily extendable diff --git a/parse.y b/parse.y index d6bc335..5397dd2 100644 --- a/parse.y +++ b/parse.y @@ -135,14 +135,25 @@ typedef struct { %} -%token ACCESS ALIAS AUTO BACKLOG BODY BUFFER CERTIFICATE CHROOT CIPHERS COMMON -%token COMBINED CONNECTION DHE DIRECTORY ECDHE ERR FCGI INDEX IP KEY LIFETIME -%token LISTEN LOCATION LOG LOGDIR MATCH MAXIMUM NO NODELAY OCSP ON PORT PREFORK -%token PROTOCOLS REQUESTS ROOT SACK SERVER SOCKET STRIP STYLE SYSLOG TCP TICKET -%token TIMEOUT TLS TYPE TYPES HSTS MAXAGE SUBDOMAINS DEFAULT PRELOAD REQUEST -%token ERROR INCLUDE AUTHENTICATE WITH BLOCK DROP RETURN PASS REWRITE -%token CA CLIENT CRL OPTIONAL PARAM FORWARDED FOUND NOT -%token ERRDOCS GZIPSTATIC BANNER STATIC_CACHE_CONTROL +%token ACCESS ALIAS AUTHENTICATE AUTO +%token BACKLOG BANNER BLOCK BODY BUFFER +%token CA CERTIFICATE CHROOT CIPHERS CLIENT COMBINED COMMON CONNECTION CRL +%token DEFAULT DHE DIRECTORY DROP +%token ECDHE ERR ERRDOCS ERROR +%token FCGI FORWARDED FOUND +%token GZIPSTATIC +%token HSTS +%token INCLUDE INDEX IP +%token KEY +%token LIFETIME LISTEN LOCATION LOG LOGDIR +%token MATCH MAXAGE MAXIMUM +%token NO NODELAY NOT +%token OCSP ON OPTIONAL +%token PARAM PASS PORT PREFORK PRELOAD PROTOCOLS +%token REQUEST REQUESTS RETURN REWRITE ROOT +%token SACK SERVER SOCKET STATIC_CACHE_CONTROL STRIP STYLE SUBDOMAINS SYSLOG +%token TCP TICKET TIMEOUT TLS TYPE TYPES +%token WITH %token STRING %token NUMBER %type port