diff options
| author | Stefano Karapetsas <[email protected]> | 2013-09-11 01:01:44 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-09-11 01:01:44 -0700 |
| commit | 2a7238bee32de88d24b541acdc06a1d1b3b73b02 (patch) | |
| tree | b33ee3e6052a3eb4c9731c649bcdae95054f613e /src/http.c | |
| parent | 48b2c97f8a0c7e8cc0d999d5c427c37daf5aabda (diff) | |
| parent | 472993545c41fa1c77e672b3e4d0df205a6fa98f (diff) | |
| download | mate-user-share-2a7238bee32de88d24b541acdc06a1d1b3b73b02.tar.bz2 mate-user-share-2a7238bee32de88d24b541acdc06a1d1b3b73b02.tar.xz | |
Merge pull request #14 from NiceandGently/master
Add support for Apache HTTPD 2.4
Diffstat (limited to 'src/http.c')
| -rw-r--r-- | src/http.c | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -26,10 +26,7 @@ #include <glib.h> #include <glib/gi18n.h> #include <X11/Xlib.h> - -#ifdef HAVE_DBUS_1_1 #include <dbus/dbus.h> -#endif #include <gio/gio.h> @@ -57,9 +54,7 @@ #define GSETTINGS_SCHEMA "org.mate.FileSharing" -#ifdef HAVE_DBUS_1_1 static char *dbus_session_id; -#endif static pid_t httpd_pid = 0; @@ -94,7 +89,7 @@ get_port (void) return -1; } -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__OpenBSD__) /* XXX This exposes a potential race condition, but without this, * httpd will not start on the above listed platforms due to the fact * that SO_REUSEADDR is also needed when Apache binds to the listening @@ -155,7 +150,6 @@ get_share_name (void) return name; } -#ifdef HAVE_DBUS_1_1 static void init_dbus() { /* The only use we make of D-BUS is to fetch the session BUS ID so we can export @@ -190,7 +184,6 @@ init_dbus() { dbus_connection_close(connection); dbus_connection_unref(connection); } -#endif static void ensure_conf_dir (void) @@ -470,9 +463,7 @@ http_down (void) gboolean http_init (void) { -#ifdef HAVE_DBUS_1_1 init_dbus(); -#endif return TRUE; } |