浏览代码

Add server side Javascript (Duktape) to feature check API

bel 9 年之前
父节点
当前提交
164b12b558
共有 2 个文件被更改,包括 12 次插入4 次删除
  1. 2 0
      include/civetweb.h
  2. 10 4
      src/civetweb.c

+ 2 - 0
include/civetweb.h

@@ -765,6 +765,8 @@ CIVETWEB_API int mg_get_response(struct mg_connection *conn,
          8  support IPv6 (USE_IPV6 set)
         16  support WebSocket (USE_WEBSOCKET set)
         32  support Lua scripts and Lua server pages (USE_LUA is set)
+        64  support server side JavaScript (USE_DUKTAPE is set)
+        The result is undefined for all other feature values.
 
    Return:
      If feature is available > 0

+ 10 - 4
src/civetweb.c

@@ -11603,7 +11603,9 @@ struct mg_context *mg_start(const struct mg_callbacks *callbacks,
 unsigned mg_check_feature(unsigned feature)
 {
 	static const unsigned feature_set = 0
-/* Set bits for available features according to API documentation. */
+/* Set bits for available features according to API documentation.
+ * This bit mask is created at compile time, according to the active
+ * preprocessor defines. It is a single const value at runtime. */
 #if !defined(NO_FILES)
 	                                    | 1
 #endif
@@ -11622,11 +11624,12 @@ unsigned mg_check_feature(unsigned feature)
 #if defined(USE_LUA)
 	                                    | 32
 #endif
-/* Set some extra bits not defined in the API documentation.
- * These bits may change without further notice. */
-#if !defined(NO_POPEN)
+#if defined(USE_DUKTAPE)
 	                                    | 64
 #endif
+
+/* Set some extra bits not defined in the API documentation.
+ * These bits may change without further notice. */
 #if defined(MG_LEGACY_INTERFACE)
 	                                    | 128
 #endif
@@ -11639,6 +11642,9 @@ unsigned mg_check_feature(unsigned feature)
 #if !defined(NO_NONCE_CHECK)
 	                                    | 1024
 #endif
+#if !defined(NO_POPEN)
+	                                    | 2048
+#endif
 	    ;
 	return (feature & feature_set);
 }