Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/httpd fix -X option parsing. noted by Rajeev V. Pil...



details:   https://anonhg.NetBSD.org/src/rev/ac2b549d9962
branches:  trunk
changeset: 446162:ac2b549d9962
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Nov 25 07:37:20 2018 +0000

description:
fix -X option parsing.  noted by Rajeev V. Pillai.

diffstat:

 libexec/httpd/bozohttpd.c |   4 ++--
 libexec/httpd/main.c      |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 41bbcfbd9fb5 -r ac2b549d9962 libexec/httpd/bozohttpd.c
--- a/libexec/httpd/bozohttpd.c Sat Nov 24 22:49:35 2018 +0000
+++ b/libexec/httpd/bozohttpd.c Sun Nov 25 07:37:20 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bozohttpd.c,v 1.98 2018/11/24 18:38:59 mrg Exp $       */
+/*     $NetBSD: bozohttpd.c,v 1.99 2018/11/25 07:37:20 mrg Exp $       */
 
 /*     $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $      */
 
@@ -109,7 +109,7 @@
 #define INDEX_HTML             "index.html"
 #endif
 #ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE                "bozohttpd/20181124"
+#define SERVER_SOFTWARE                "bozohttpd/20181125"
 #endif
 #ifndef PUBLIC_HTML
 #define PUBLIC_HTML            "public_html"
diff -r 41bbcfbd9fb5 -r ac2b549d9962 libexec/httpd/main.c
--- a/libexec/httpd/main.c      Sat Nov 24 22:49:35 2018 +0000
+++ b/libexec/httpd/main.c      Sun Nov 25 07:37:20 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.21 2018/11/24 02:30:56 mrg Exp $    */
+/*     $NetBSD: main.c,v 1.22 2018/11/25 07:37:20 mrg Exp $    */
 
 /*     $eterna: main.c,v 1.6 2011/11/18 09:21:15 mrg Exp $     */
 /* from: eterna: bozohttpd.c,v 1.159 2009/05/23 02:14:30 mrg Exp       */
@@ -336,10 +336,6 @@
                        bozo_set_pref(&httpd, &prefs, "enable users", "true");
                        break;
 
-                       bozo_set_pref(&httpd, &prefs, "directory indexing",
-                                     "true");
-                       break;
-
                case 'V':
                        bozo_set_pref(&httpd, &prefs, "unknown slash", "true");
                        break;
@@ -352,6 +348,10 @@
                        if (!have_dirindex)
                                goto no_dirindex_support;
 
+                       bozo_set_pref(&httpd, &prefs, "directory indexing",
+                                     "true");
+                       break;
+
                case 'x':
                        bozo_set_pref(&httpd, &prefs, "index.html", optarg);
                        break;



Home | Main Index | Thread Index | Old Index