From 546aea474cc02573cd74a9fdaa40067d9fea0e7b Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Wed, 6 Aug 2014 20:29:54 +0000
Subject: [PATCH] Change grammar to remove a shift/reduce conflict that was
 introduced with the ssl options. "listen on $ip port 443 ssl" turns into
 "listen on $ip ssl port 443".

ok florian@
---
 src/etc/examples/httpd.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/examples/httpd.conf b/src/etc/examples/httpd.conf
index c276797b..f8364fd3 100644
--- a/src/etc/examples/httpd.conf
+++ b/src/etc/examples/httpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: httpd.conf,v 1.9 2014/08/05 18:01:10 reyk Exp $
+# $OpenBSD: httpd.conf,v 1.10 2014/08/06 20:29:54 reyk Exp $
 
 #
 # Macros
@@ -47,7 +47,7 @@ server "www.example.com" {
 
 # An HTTPS server using SSL/TLS
 server "secure.example.com" {
-	listen on 127.0.0.1 port 443 ssl
+	listen on 127.0.0.1 ssl port 443
 
 	# Define server-specific log files relative to /logs
 	log { access "secure-access.log", error "secure-error.log" }