update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / civetweb / include / CivetServer.h

diff --git a/ceph/src/civetweb/include/CivetServer.h b/ceph/src/civetweb/include/CivetServer.h
index ee15ae3024683f02fae61155f39535daac9ac99a..2da1096d846de5f51bc04f3efcd3c37119e0849a 100644 (file)
--- a/ceph/src/civetweb/include/CivetServer.h
+++ b/ceph/src/civetweb/include/CivetServer.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 the Civetweb developers
+/* Copyright (c) 2013-2017 the Civetweb developers
  * Copyright (c) 2013 No Face Press, LLC
  *
  * License http://opensource.org/licenses/mit-license.php MIT License
@@ -227,9 +227,11 @@ class CIVETWEB_API CivetServer
         * @throws CivetException
         */
        CivetServer(const char **options,
-                   const struct CivetCallbacks *callbacks = 0);
+                   const struct CivetCallbacks *callbacks = 0,
+                   const void *UserContext = 0);
        CivetServer(std::vector<std::string> options,
-                   const struct CivetCallbacks *callbacks = 0);
+                   const struct CivetCallbacks *callbacks = 0,
+                   const void *UserContext = 0);
 
        /**
         * Destructor
@@ -531,6 +533,14 @@ class CIVETWEB_API CivetServer
                              std::string &dst,
                              bool append = false);
 
+       // generic user context which can be set/read,
+       // the server does nothing with this apart from keep it.
+       const void *
+       getUserContext() const
+       {
+               return UserContext;
+       }
+
   protected:
        class CivetConnection
        {
@@ -545,6 +555,10 @@ class CIVETWEB_API CivetServer
        struct mg_context *context;
        std::map<struct mg_connection *, class CivetConnection> connections;
 
+       // generic user context which can be set/read,
+       // the server does nothing with this apart from keep it.
+       const void *UserContext;
+
   private:
        /**
         * requestHandler(struct mg_connection *, void *cbdata)