Changeset accbb83 in mod_gnutls for src

Timestamp:

Jan 21, 2015, 5:29:48 AM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

07d548d

Parents:

c4ba9722

Message:

mod_gnutls.c: Whitespace and line break fixes

File:

• src/mod_gnutls.c (modified) (6 diffs)

src/mod_gnutls.c

@@ -28 +28 @@
     /* Try Run Post-Config Hook After mod_proxy */
     static const char * const aszPre[] = { "mod_proxy.c", NULL };
-    ap_hook_post_config(mgs_hook_post_config, aszPre, NULL,APR_HOOK_REALLY_LAST);
+    ap_hook_post_config(mgs_hook_post_config, aszPre, NULL,
+                        APR_HOOK_REALLY_LAST);
     /* HTTP Scheme Hook */
 #if USING_2_1_RECENT
@@ -36 +37 @@
 #endif
     /* Default Port Hook */
-    ap_hook_default_port(mgs_hook_default_port,  NULL,NULL, APR_HOOK_MIDDLE);
+    ap_hook_default_port(mgs_hook_default_port, NULL, NULL, APR_HOOK_MIDDLE);
     /* Pre-Connect Hook */
-    ap_hook_pre_connection(mgs_hook_pre_connection, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_pre_connection(mgs_hook_pre_connection, NULL, NULL,
+                           APR_HOOK_MIDDLE);
     /* Pre-Config Hook */
     ap_hook_pre_config(mgs_hook_pre_config, NULL, NULL,
-            APR_HOOK_MIDDLE);
+                       APR_HOOK_MIDDLE);
     /* Child-Init Hook */
     ap_hook_child_init(mgs_hook_child_init, NULL, NULL,
-            APR_HOOK_MIDDLE);
+                       APR_HOOK_MIDDLE);
     /* Authentication Hook */
     ap_hook_access_checker(mgs_hook_authz, NULL, NULL,
-            APR_HOOK_REALLY_FIRST);
+                           APR_HOOK_REALLY_FIRST);
     /* Fixups Hook */
     ap_hook_fixups(mgs_hook_fixups, NULL, NULL, APR_HOOK_REALLY_FIRST);
@@ -57 +59 @@
 
     /* Input Filter */
-    ap_register_input_filter(GNUTLS_INPUT_FILTER_NAME,
-            mgs_filter_input, NULL,AP_FTYPE_CONNECTION + 5);
+    ap_register_input_filter(GNUTLS_INPUT_FILTER_NAME, mgs_filter_input,
+                             NULL, AP_FTYPE_CONNECTION + 5);
     /* Output Filter */
-    ap_register_output_filter(GNUTLS_OUTPUT_FILTER_NAME,
-            mgs_filter_output, NULL,AP_FTYPE_CONNECTION + 5);
+    ap_register_output_filter(GNUTLS_OUTPUT_FILTER_NAME, mgs_filter_output,
+                              NULL, AP_FTYPE_CONNECTION + 5);
 
     /* mod_proxy calls these functions */
@@ -68 +70 @@
 }
 
-int ssl_is_https(conn_rec *c) {
+int ssl_is_https(conn_rec *c)
+{
     mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
-            ap_get_module_config(c->base_server->module_config, &gnutls_module);
+        ap_get_module_config(c->base_server->module_config, &gnutls_module);
     if(sc->enabled == 0 || sc->non_ssl_request == 1) {
         /* SSL/TLS Disabled or Plain HTTP Connection Detected */
@@ -88 +91 @@
 
     /* disable TLS for this connection */
-    mgs_handle_t *ctxt = (mgs_handle_t *) ap_get_module_config(c->conn_config, &gnutls_module);
+    mgs_handle_t *ctxt = (mgs_handle_t *)
+        ap_get_module_config(c->conn_config, &gnutls_module);
     if (ctxt == NULL)
     {
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, "%s: allocating connection memory", __func__);
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c,
+                      "%s: allocating connection memory", __func__);
         ctxt = apr_pcalloc(c->pool, sizeof (*ctxt));
         ap_set_module_config(c->conn_config, &gnutls_module, ctxt);
@@ -105 +110 @@
 }
 
-int ssl_proxy_enable(conn_rec *c) {
+int ssl_proxy_enable(conn_rec *c)
+{
     mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
-            ap_get_module_config(c->base_server->module_config, &gnutls_module);
+        ap_get_module_config(c->base_server->module_config, &gnutls_module);
     sc->proxy_enabled = GNUTLS_ENABLED_TRUE;
     sc->enabled = GNUTLS_ENABLED_FALSE;