Permalink
Browse files

Bump version number to 2.2.2.

  • Loading branch information...
1 parent b0cb78a commit fe4fd9bc03188f202f8f00c6561b24db21c62437 @FooBarWidget FooBarWidget committed Apr 26, 2009
View
@@ -242,6 +242,7 @@ end
ext/common/Application.h
ext/common/MessageChannel.h
ext/common/PoolOptions.h
+ ext/common/Version.h
ext/common/Utils.h)
}
APACHE2_OBJECTS = APACHE2_INPUT_FILES.keys
@@ -45,9 +45,6 @@
* @{
*/
-/** Module version number. */
-#define PASSENGER_VERSION "2.2.1"
-
#ifdef __cplusplus
#include <set>
#include <string>
View
@@ -39,6 +39,7 @@
#include "ApplicationPoolServer.h"
#include "MessageChannel.h"
#include "DirectoryMapper.h"
+#include "Version.h"
/* The Apache/APR headers *must* come after the Boost headers, otherwise
* compilation will fail on OpenBSD.
View
@@ -0,0 +1,31 @@
+/*
+ * Phusion Passenger - http://www.modrails.com/
+ * Copyright (c) 2009 Phusion
+ *
+ * "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ * 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_VERSION_H_
+#define _PASSENGER_VERSION_H_
+
+/* Don't forget to update lib/phusion_passenger/constants.rb too. */
+#define PASSENGER_VERSION "2.2.2"
+
+#endif /* _PASSENGER_VERSION_H */
@@ -30,6 +30,7 @@
#include "ContentHandler.h"
#include "StaticContentHandler.h"
#include "Configuration.h"
+#include "../common/Version.h"
#define NGX_HTTP_SCGI_PARSE_NO_HEADER 20
@@ -1008,7 +1009,7 @@ process_header(ngx_http_request_t *r)
h->key.len = sizeof("Server") - 1;
h->key.data = (u_char *) "Server";
- h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger (mod_rails/mod_rack)");
+ h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger " PASSENGER_VERSION " (mod_rails/mod_rack)");
h->value.len = ngx_strlen(h->value.data);
h->lowcase_key = (u_char *) "server";
}
View
@@ -20,7 +20,8 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
${ngx_addon_dir}/Configuration.h \
${ngx_addon_dir}/ContentHandler.h \
${ngx_addon_dir}/StaticContentHandler.h \
- ${ngx_addon_dir}/ngx_http_passenger_module.h"
+ ${ngx_addon_dir}/ngx_http_passenger_module.h \
+ ${ngx_addon_dir}/../common/Version.h"
CORE_LIBS="$CORE_LIBS \
${ngx_addon_dir}/libpassenger_common.a \
${ngx_addon_dir}/libboost_oxt.a \
@@ -23,8 +23,8 @@
module PhusionPassenger
# Phusion Passenger version number.
- # Don't forget to edit Configuration.h too.
- VERSION_STRING = '2.2.1'
+ # Don't forget to edit ext/common/Version.h too.
+ VERSION_STRING = '2.2.2'
DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
DEFAULT_APP_SPAWNER_MAX_IDLE_TIME = 10 * 60

0 comments on commit fe4fd9b

Please sign in to comment.