From 5e2df4bb9acb0ad1c1b490098b004d472d863e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?=
 <agentzh@gmail.com>
Date: Thu, 4 Aug 2011 12:01:53 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20a=20regression=20while=20specifying=20-?=
 =?UTF-8?q?-with-http=5Ficonv=5Fmodule=20during=20./configure.=20thanks=20?=
 =?UTF-8?q?=E5=86=AF=E6=96=B0=E5=9B=BD=20for=20reporting=20this=20issue=20?=
 =?UTF-8?q?released=20ngx=5Fopenresty=201.0.4.2rc2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 util/configure | 2 +-
 util/ver       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/configure b/util/configure
index 75f1979..70188b8 100755
--- a/util/configure
+++ b/util/configure
@@ -51,10 +51,10 @@ if ($OS =~ /solaris|sunos/i) {
 }
 
 my @modules = (
+    [ndk => 'ngx_devel_kit'],
     [http_iconv => 'iconv-nginx-module', 'disabled'],
     [http_echo => 'echo-nginx-module'],
     [http_xss => 'xss-nginx-module'],
-    [ndk => 'ngx_devel_kit'],
     [http_set_misc => 'set-misc-nginx-module'],
     [http_form_input => 'form-input-nginx-module'],
     [http_encrypted_session => 'encrypted-session-nginx-module'],
diff --git a/util/ver b/util/ver
index e9d64f1..af3993f 100755
--- a/util/ver
+++ b/util/ver
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 main_ver=1.0.4
-minor_ver=2rc1
+minor_ver=2rc2
 version=$main_ver.$minor_ver
 echo $version