passenger 5.1.12 → 5.2.0

data/src/cxx_supportlib/FileTools/PathManip.h

@@ -0,0 +1,91 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_FILE_TOOLS_PATH_MANIP_H_
+#define _PASSENGER_FILE_TOOLS_PATH_MANIP_H_
+
+#include <string>
+#include <StaticString.h>
+
+namespace Passenger {
+
+using namespace std;
+
+// All functions in this file allow non-NULL-terminated StaticStrings.
+
+
+/**
+ * Returns a canonical version of the specified path. All symbolic links
+ * and relative path elements are resolved.
+ *
+ * @throws FileSystemException Something went wrong.
+ */
+string canonicalizePath(const string &path);
+
+/**
+ * Turns the given path into an absolute path. Unlike realpath(), this function does
+ * not resolve symlinks.
+ *
+ * @throws SystemException
+ */
+string absolutizePath(const StaticString &path, const StaticString &workingDir = StaticString());
+
+/**
+ * If `path` refers to a symlink, then this function resolves the
+ * symlink for 1 level. That is, if the symlink points to another symlink,
+ * then the other symlink will not be resolved. The resolved path is returned.
+ *
+ * If the symlink doesn't point to an absolute path, then this function will
+ * prepend `path`'s directory to the result.
+ *
+ * If `path` doesn't refer to a symlink then this method will return
+ * `path<`.
+ *
+ * @throws FileSystemException Something went wrong.
+ */
+ string resolveSymlink(const StaticString &path);
+
+/**
+ * Given a path, extracts its directory name.
+ */
+string extractDirName(const StaticString &path);
+
+/**
+ * Given a path, extracts its directory name. This version does not use
+ * any dynamically allocated storage.
+ * It returns a StaticString that points either to
+ * an immutable constant string, or to a substring of `path`.
+ */
+StaticString extractDirNameStatic(const StaticString &path);
+
+/**
+ * Given a path, extracts its base name.
+ */
+string extractBaseName(const StaticString &path);
+
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_FILE_TOOLS_PATH_MANIP_H_ */

data/src/cxx_supportlib/FileTools/PathManipCBindings.cpp

@@ -0,0 +1,62 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+#include <FileTools/PathManipCBindings.h>
+#include <FileTools/PathManip.h>
+#include <cstring>
+
+using namespace std;
+using namespace Passenger;
+
+extern "C" {
+
+
+char *
+psg_absolutize_path(const char *path, size_t path_len,
+	const char *working_dir, size_t working_dir_len,
+	size_t *result_len)
+{
+	string result = absolutizePath(StaticString(path, path_len),
+		StaticString(working_dir, working_dir_len));
+	if (result_len != NULL) {
+		*result_len = result.size();
+	}
+	return strdup(result.c_str());
+}
+
+const char *
+psg_extract_dir_name_static(const char *path,
+	size_t path_len, size_t *result_len)
+{
+	StaticString result = extractDirNameStatic(StaticString(path, path_len));
+	if (result_len != NULL) {
+		*result_len = result.size();
+	}
+	return result.data();
+}
+
+
+} // extern "C"

data/src/{apache2_module/Configuration.h → cxx_supportlib/FileTools/PathManipCBindings.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,32 +23,25 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_CONFIGURATION_H_
-#define _PASSENGER_CONFIGURATION_H_
+#ifndef _PASSENGER_FILE_TOOLS_PATH_MANIP_C_BINDINGS_H_
+#define _PASSENGER_FILE_TOOLS_PATH_MANIP_C_BINDINGS_H_
 
-#include <apr_pools.h>
-#include <httpd.h>
-#include <http_config.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
-	extern "C" {
+extern "C" {
 #endif
 
 
-/** Configuration hook for per-directory configuration structure creation. */
-void *passenger_config_create_dir(apr_pool_t *p, char *dirspec);
-
-/** Configuration hook for per-directory configuration structure merging. */
-void *passenger_config_merge_dir(apr_pool_t *p, void *basev, void *addv);
-
-void passenger_postprocess_config(server_rec *s);
-
-/** Apache module commands array. */
-extern const command_rec passenger_commands[];
+char *psg_absolutize_path(const char *path, size_t path_len,
+	const char *working_dir, size_t working_dir_len,
+	size_t *result_len);
+const char *psg_extract_dir_name_static(const char *path,
+	size_t path_len, size_t *result_len);
 
 
 #ifdef __cplusplus
-	}
+}
 #endif
 
-#endif /* _PASSENGER_CONFIGURATION_H_ */
+#endif /* _PASSENGER_FILE_TOOLS_PATH_MANIP_C_BINDINGS_H_ */

data/src/cxx_supportlib/Hooks.h

@@ -39,12 +39,13 @@
 #include <cctype>
 #include <stdlib.h>
 
+#include <jsoncpp/json.h>
+
 #include <LoggingKit/LoggingKit.h>
 #include <ProcessManagement/Spawn.h>
 #include <ProcessManagement/Utils.h>
 #include <Utils.h>
 #include <Utils/StrIntUtils.h>
-#include <Utils/VariantMap.h>
 
 namespace Passenger {
 
@@ -58,31 +59,35 @@ struct HookScriptOptions {
 	string spec;
 
 	// Optional.
-	const VariantMap *agentsOptions;
+	Json::Value agentConfig;
 	vector< pair<string, string> > environment;
-
-	HookScriptOptions()
-		: agentsOptions(NULL)
-		{ }
 };
 
 namespace {
 	inline vector< pair<string, string> >
-	agentsOptionsToEnvVars(const VariantMap &agentsOptions) {
+	agentConfigToEnvVars(const Json::Value &config) {
 		vector< pair<string, string> > result;
-		VariantMap::ConstIterator it, end = agentsOptions.end();
+		Json::Value::const_iterator it, end = config.end();
 
-		result.reserve(agentsOptions.size());
-		for (it = agentsOptions.begin(); it != end; it++) {
+		result.reserve(config.size());
+		for (it = config.begin(); it != end; it++) {
 			string key = "PASSENGER_";
-			const char *data = it->first.data();
-			const char *end = it->first.data() + it->first.size();
+			const char *end;
+			const char *data = it.memberName(&end);
 
 			while (data < end) {
 				key.append(1, toupper(*data));
 				data++;
 			}
-			result.push_back(make_pair(key, it->second));
+			switch (it->type()) {
+			case Json::nullValue:
+			case Json::stringValue:
+				result.push_back(make_pair(key, it->asString()));
+				break;
+			default:
+				result.push_back(make_pair(key, it->toStyledString()));
+				break;
+			}
 		}
 
 		return result;
@@ -100,9 +105,7 @@ namespace {
 	inline void
 	createHookScriptEnvironment(const HookScriptOptions &options, vector< pair<string, string> > &envvars) {
 		vector< pair<string, string> >::const_iterator it, end = options.environment.end();
-		if (options.agentsOptions) {
-			envvars = agentsOptionsToEnvVars(*options.agentsOptions);
-		}
+		envvars = agentConfigToEnvVars(options.agentConfig);
 		for (it = options.environment.begin(); it != end; it++) {
 			envvars.push_back(*it);
 		}

data/src/cxx_supportlib/InstanceDirectory.h

@@ -37,11 +37,14 @@
 #include <fcntl.h>
 #include <cerrno>
 #include <cassert>
+#include <ctime>
 #include <string>
 #include <Constants.h>
 #include <Exceptions.h>
 #include <RandomGenerator.h>
+#include <FileTools/FileManip.h>
 #include <Utils.h>
+#include <Utils/StrIntUtils.h>
 #include <Utils/IOUtils.h>
 #include <Utils/SystemTime.h>
 #include <jsoncpp/json.h>
@@ -224,6 +227,7 @@ private:
 		props["instance_dir"]["created_at_monotonic_usec"] = (Json::UInt64) SystemTime::getMonotonicUsec();
 		props["passenger_version"] = PASSENGER_VERSION;
 		props["watchdog_pid"] = (Json::UInt64) getpid();
+		props["instance_id"] = generateInstanceId();
 
 		Json::Value::Members members = options.properties.getMemberNames();
 		Json::Value::Members::const_iterator it, end = members.end();
@@ -288,6 +292,13 @@ public:
 		owner = false;
 		removeDirTree(path);
 	}
+
+	static string generateInstanceId() {
+		RandomGenerator randomGenerator;
+		return integerToHexatri((unsigned long long) time(NULL))
+			+ "-" + randomGenerator.generateAsciiString(6)
+			+ "-" + randomGenerator.generateAsciiString(6);
+	}
 };
 
 typedef boost::shared_ptr<InstanceDirectory> InstanceDirectoryPtr;

data/src/cxx_supportlib/JsonTools/Autocast.h

@@ -0,0 +1,79 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2017 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_JSON_TOOLS_AUTOCAST_H_
+#define _PASSENGER_JSON_TOOLS_AUTOCAST_H_
+
+#include <boost/regex.hpp>
+#include <jsoncpp/json.h>
+
+#include <cstdlib>
+#include <string>
+#include <StaticString.h>
+
+namespace Passenger {
+
+using namespace std;
+
+
+inline Json::Value
+autocastValueToJson(const StaticString &value) {
+	static const boost::regex intRegex("\\A-?[0-9]+\\z");
+	static const boost::regex realRegex("\\A-?[0-9]+(\\.[0-9]+)?([eE][+\\-]?[0-9]+)?\\z");
+	static const boost::regex boolRegex("\\A(true|false|on|off|yes|no)\\z",
+		boost::regex::perl | boost::regex::icase);
+	static const boost::regex trueRegex("\\A(true|on|yes)\\z",
+		boost::regex::perl | boost::regex::icase);
+	const char *valueData = value.data();
+	const char *valueEnd = value.data() + value.size();
+	boost::cmatch results;
+
+	if (boost::regex_match(valueData, valueEnd, results, intRegex)) {
+		#if __cplusplus >= 201103
+			return (Json::Int64) atoll(value.toString().c_str());
+		#else
+			return (Json::Int64) atol(value.toString().c_str());
+		#endif
+	} else if (boost::regex_match(valueData, valueEnd, results, realRegex)) {
+		return atof(value.toString().c_str());
+	} else if (boost::regex_match(valueData, valueEnd, results, boolRegex)) {
+		return boost::regex_match(valueData, valueEnd, results, trueRegex);
+	} else if (value.size() > 0 && (valueData[0] == '{' || valueData[0] == '[')) {
+		Json::Reader reader;
+		Json::Value jValue;
+		if (reader.parse(value, jValue)) {
+			return jValue;
+		} else {
+			return Json::Value(valueData, valueEnd);
+		}
+	} else {
+		return Json::Value(valueData, valueEnd);
+	}
+}
+
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_JSON_TOOLS_AUTOCAST_H_ */

data/src/cxx_supportlib/JsonTools/CBindings.cpp

@@ -0,0 +1,364 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2017 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+#include <JsonTools/CBindings.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <jsoncpp/json.h>
+#include <JsonTools/Autocast.h>
+
+using namespace std;
+using namespace Passenger;
+
+extern "C" {
+
+
+PsgJsonValue *
+psg_json_value_new_null() {
+	return new Json::Value();
+}
+
+PsgJsonValue *
+psg_json_value_new_with_type(PsgJsonValueType type) {
+	Json::ValueType realType;
+	switch (type) {
+	case PSG_JSON_VALUE_TYPE_NULL:
+		realType = Json::nullValue;
+		break;
+	case PSG_JSON_VALUE_TYPE_INT:
+		realType = Json::intValue;
+		break;
+	case PSG_JSON_VALUE_TYPE_UINT:
+		realType = Json::uintValue;
+		break;
+	case PSG_JSON_VALUE_TYPE_REAL:
+		realType = Json::realValue;
+		break;
+	case PSG_JSON_VALUE_TYPE_STRING:
+		realType = Json::stringValue;
+		break;
+	case PSG_JSON_VALUE_TYPE_BOOLEAN:
+		realType = Json::booleanValue;
+		break;
+	case PSG_JSON_VALUE_TYPE_ARRAY:
+		realType = Json::arrayValue;
+		break;
+	case PSG_JSON_VALUE_TYPE_OBJECT:
+		realType = Json::objectValue;
+		break;
+	default:
+		fprintf(stderr, "BUG: Unrecognized PsgJsonValueType %d\n", (int) type);
+		abort();
+		break;
+	}
+	return new Json::Value(realType);
+}
+
+PsgJsonValue *
+psg_json_value_new_str(const char *val, size_t size) {
+	return new Json::Value(val, val + size);
+}
+
+PsgJsonValue *
+psg_json_value_new_int(int val) {
+	return new Json::Value(val);
+}
+
+PsgJsonValue *
+psg_json_value_new_uint(unsigned int val) {
+	return new Json::Value(val);
+}
+
+PsgJsonValue *
+psg_json_value_new_real(double val) {
+	return new Json::Value(val);
+}
+
+PsgJsonValue *
+psg_json_value_new_bool(int val) {
+	return new Json::Value((bool) val);
+}
+
+void
+psg_json_value_free(PsgJsonValue *val) {
+	delete (Json::Value *) val;
+}
+
+
+PsgJsonValue *
+psg_json_value_get_or_create_null(PsgJsonValue *doc, const char *name, size_t size) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	if (size == (size_t) -1) {
+		size = strlen(name);
+	}
+	return &cxxdoc[string(name, size)];
+}
+
+PsgJsonValue *
+psg_json_value_get(PsgJsonValue *doc, const char *name, size_t size) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	if (size == (size_t) -1) {
+		size = strlen(name);
+	}
+	if (cxxdoc.isMember(name, name + size)) {
+		return &cxxdoc[string(name, size)];
+	} else {
+		return NULL;
+	}
+}
+
+PsgJsonValue *
+psg_json_value_get_at_index(PsgJsonValue *doc, unsigned int index) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	if (index >= cxxdoc.size()) {
+		return NULL;
+	} else {
+		return &cxxdoc[index];
+	}
+}
+
+PsgJsonValueType
+psg_json_value_type(const PsgJsonValue *doc) {
+	const Json::Value &cxxdoc = *static_cast<const Json::Value *>(doc);
+	switch (cxxdoc.type()) {
+	case Json::nullValue:
+		return PSG_JSON_VALUE_TYPE_NULL;
+	case Json::intValue:
+		return PSG_JSON_VALUE_TYPE_INT;
+	case Json::uintValue:
+		return PSG_JSON_VALUE_TYPE_UINT;
+	case Json::realValue:
+		return PSG_JSON_VALUE_TYPE_REAL;
+	case Json::stringValue:
+		return PSG_JSON_VALUE_TYPE_STRING;
+	case Json::booleanValue:
+		return PSG_JSON_VALUE_TYPE_BOOLEAN;
+	case Json::arrayValue:
+		return PSG_JSON_VALUE_TYPE_ARRAY;
+	case Json::objectValue:
+		return PSG_JSON_VALUE_TYPE_OBJECT;
+	default:
+		fprintf(stderr, "BUG: Unrecognized Json::ValueType %d\n", (int) cxxdoc.type());
+		abort();
+		return PSG_JSON_VALUE_TYPE_NULL;
+	}
+}
+
+int
+psg_json_value_eq(const PsgJsonValue *doc, const PsgJsonValue *doc2) {
+	const Json::Value &cxxdoc = *static_cast<const Json::Value *>(doc);
+	const Json::Value &cxxdoc2 = *static_cast<const Json::Value *>(doc2);
+	return cxxdoc == cxxdoc2;
+}
+
+int
+psg_json_value_is_member(const PsgJsonValue *doc, const char *name, size_t size) {
+	const Json::Value &cxxdoc = *static_cast<const Json::Value *>(doc);
+	if (size == (size_t) -1) {
+		size = strlen(name);
+	}
+	return cxxdoc.isMember(name, name + size);
+}
+
+unsigned int
+psg_json_value_size(const PsgJsonValue *doc) {
+	const Json::Value &cxxdoc = *static_cast<const Json::Value *>(doc);
+	return cxxdoc.size();
+}
+
+
+PsgJsonValue *
+psg_json_value_set_value(PsgJsonValue *doc, const char *name, size_t name_size, const PsgJsonValue *val) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	if (name_size == (size_t) -1) {
+		name_size = strlen(name);
+	}
+	Json::Value &newVal = cxxdoc[string(name, name_size)];
+	newVal = *static_cast<const Json::Value *>(val);
+	return &newVal;
+}
+
+PsgJsonValue *
+psg_json_value_set_str(PsgJsonValue *doc, const char *name, const char *val, size_t size) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	Json::Value &newVal = cxxdoc[name];
+	if (size == (size_t) -1) {
+		size = strlen(val);
+	}
+	newVal = Json::Value(val, val + size);
+	return &newVal;
+}
+
+PsgJsonValue *
+psg_json_value_set_int(PsgJsonValue *doc, const char *name, int val) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	Json::Value &newVal = cxxdoc[name];
+	newVal = (Json::Int) val;
+	return &newVal;
+}
+
+PsgJsonValue *
+psg_json_value_set_uint(PsgJsonValue *doc, const char *name, unsigned int val) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	Json::Value &newVal = cxxdoc[name];
+	newVal = (Json::UInt) val;
+	return &newVal;
+}
+
+PsgJsonValue *
+psg_json_value_set_real(PsgJsonValue *doc, const char *name, double val) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	Json::Value &newVal = cxxdoc[name];
+	newVal = val;
+	return &newVal;
+}
+
+PsgJsonValue *
+psg_json_value_set_bool(PsgJsonValue *doc, const char *name, int val) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	Json::Value &newVal = cxxdoc[name];
+	newVal = (bool) val;
+	return &newVal;
+}
+
+
+PsgJsonValue *
+psg_json_value_append_val(PsgJsonValue *doc, const PsgJsonValue *val) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	return &cxxdoc.append(*static_cast<const Json::Value *>(val));
+}
+
+void
+psg_json_value_swap(PsgJsonValue *doc, PsgJsonValue *doc2) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	Json::Value &cxxdoc2 = *static_cast<Json::Value *>(doc2);
+	cxxdoc.swap(cxxdoc2);
+}
+
+
+int
+psg_json_value_is_null(const PsgJsonValue *doc) {
+	const Json::Value &cxxdoc = *static_cast<const Json::Value *>(doc);
+	return cxxdoc.isNull();
+}
+
+int
+psg_json_value_empty(const PsgJsonValue *doc) {
+	const Json::Value &cxxdoc = *static_cast<const Json::Value *>(doc);
+	return cxxdoc.empty();
+}
+
+const char *
+psg_json_value_as_cstr(const PsgJsonValue *doc) {
+	const Json::Value &cxxdoc = *static_cast<const Json::Value *>(doc);
+	return cxxdoc.asCString();
+}
+
+const char *
+psg_json_value_get_str(const PsgJsonValue *doc, size_t *size) {
+	const Json::Value &cxxdoc = *static_cast<const Json::Value *>(doc);
+	const char *data, *end;
+	if (cxxdoc.getString(&data, &end)) {
+		if (size != NULL) {
+			*size = end - data;
+		}
+		return data;
+	} else {
+		return NULL;
+	}
+}
+
+
+void
+psg_json_value_begin(PsgJsonValue *doc, PsgJsonValueIterator *it) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	Json::Value::iterator &cxxit = *static_cast<Json::Value::iterator *>(it);
+	cxxit = cxxdoc.begin();
+}
+
+void
+psg_json_value_end(PsgJsonValue *doc, PsgJsonValueIterator *it) {
+	Json::Value &cxxdoc = *static_cast<Json::Value *>(doc);
+	Json::Value::iterator &cxxit = *static_cast<Json::Value::iterator *>(it);
+	cxxit = cxxdoc.end();
+}
+
+
+char *
+psg_json_value_to_styled_string(const PsgJsonValue *doc) {
+	const Json::Value &cxxdoc = *static_cast<const Json::Value *>(doc);
+	return strdup(cxxdoc.toStyledString().c_str());
+}
+
+
+PsgJsonValue *
+psg_autocast_value_to_json(const char *data, size_t size, char **error) {
+	return new Json::Value(autocastValueToJson(StaticString(data, size)));
+}
+
+
+PsgJsonValueIterator *
+psg_json_value_iterator_new() {
+	return new Json::Value::iterator();
+}
+
+void
+psg_json_value_iterator_free(PsgJsonValueIterator *it) {
+	Json::Value::iterator &cxxit = *static_cast<Json::Value::iterator *>(it);
+	delete &cxxit;
+}
+
+void
+psg_json_value_iterator_advance(PsgJsonValueIterator *it) {
+	Json::Value::iterator &cxxit = *static_cast<Json::Value::iterator *>(it);
+	cxxit++;
+}
+
+int
+psg_json_value_iterator_eq(PsgJsonValueIterator *it, PsgJsonValueIterator *other) {
+	Json::Value::iterator &cxxit = *static_cast<Json::Value::iterator *>(it);
+	Json::Value::iterator &cxxOther = *static_cast<Json::Value::iterator *>(other);
+	return cxxit == cxxOther;
+}
+
+const char *
+psg_json_value_iterator_get_name(PsgJsonValueIterator *it, size_t *size) {
+	Json::Value::iterator &cxxit = *static_cast<Json::Value::iterator *>(it);
+	const char *result, *end;
+	result = cxxit.memberName(&end);
+	*size = end - result;
+	return result;
+}
+
+PsgJsonValue *
+psg_json_value_iterator_get_value(PsgJsonValueIterator *it) {
+	Json::Value::iterator &cxxit = *static_cast<Json::Value::iterator *>(it);
+	return &(*cxxit);
+}
+
+
+} // extern "C"