apache 1.3.14 + mod_ssl 2.7.1 merge

1 files changed, 5 insertions, 3 deletions

diff --git a/usr.sbin/httpd/src/modules/example/mod_example.c b/usr.sbin/httpd/src/modules/example/mod_example.c
index 68a6b06fe3a..3272ecc82ca 100644
--- a/usr.sbin/httpd/src/modules/example/mod_example.c
+++ b/usr.sbin/httpd/src/modules/example/mod_example.c
@@ -424,9 +424,11 @@ static void trace_add(server_rec *s, request_rec *r, excfg *mconfig,
      * on the size (and readability) of the error_log is considerable.
      */
 #define EXAMPLE_LOG_EACH 0
-    if (EXAMPLE_LOG_EACH && (s != NULL)) {
+#if EXAMPLE_LOG_EACH
+    if (s != NULL) {
         ap_log_error(APLOG_MARK, APLOG_DEBUG, s, "mod_example: %s", note);
     }
+#endif
 }
 
 /*--------------------------------------------------------------------------*/
@@ -707,7 +709,7 @@ static void example_child_exit(server_rec *s, pool *p)
 }
 
 /*
- * This function gets called to create up a per-directory configuration
+ * This function gets called to create a per-directory configuration
  * record.  This will be called for the "default" server environment, and for
  * each directory for which the parser finds any of our directives applicable.
  * If a directory doesn't have any of our directives involved (i.e., they
@@ -1126,7 +1128,7 @@ module example_module =
     example_create_server_config,       /* server config creator */
     example_merge_server_config,        /* server config merger */
     example_cmds,               /* command table */
-    example_handlers,           /* [7] list of handlers */
+    example_handlers,           /* [9] list of handlers */
     example_translate_handler,  /* [2] filename-to-URI translation */
     example_check_user_id,      /* [5] check/validate user_id */
     example_auth_checker,       /* [6] check user_id is valid *here* */