Added the files of CHANGES, NOTICE and LICENSE.

lide-reed · Aug 17, 2012 · e274d22 · e274d22
1 parent 20dd617
commit e274d22
Show file tree

Hide file tree

Showing 25 changed files with 882 additions and 5 deletions.
diff --git a/ABOUT_APACHE2NGINX b/ABOUT_APACHE2NGINX
@@ -1,3 +1,41 @@
+                     The Apache2Nginx Tool Project
+
+                             August 2012
+
+The Apache2Nginx Project is a collaborative software development effort aimed
+at creating a command line tool, which can be used to generate nginx conf file
+according to given config files of Apache Httpd.
+
+In addition, serveral users have contributed ideas, code, and documentation 
+to the project.  This file is intended to briefly describe the history of the 
+Apache2Nginx, recognize the many contributors, and explain how you can join 
+the fun too.
+
+In March of 2012, Reed Lee put forwards to an idea which can help people to
+migrate web server from Apache Httpd to Nginx.
+
+In April of 2012, Reed Lee developed a prototype, which is based on the source
+code of Apache Httpd, and then, James Lee and Youngseok choi also joined.
+
+In August 2012, the version 1.0.0 released.
+
+How to become involved in the Apache2Nginx Tool project
+=======================================================
+
+There are several levels of contributing.  If you just want to send
+in an occasional suggestion/fix, then you can just use the bug reporting
+form at <https://github.com/nhnc-nginx/apache2nginx/issues>.  
+You can also mail to apache2nginx@gmail.com.
+
+If you'd like to become an active contributor to the Apache2Nginx Tool
+project, You can also mail to apache2nginx@gmail.com.
+
+Thanks for using Apache2Nginx!
+
+
+Disclaimer of Liability
+========================
+
 THE AUTHOR(S) OF APACHE2NGINX SOFTWARE IS NOT LIABLE FOR ANY DAMAGES SUFFERED AS A RESULT OF USING, MODIFYING, CONTRIBUTING, OR COPYING THE SOFTWARE. THE AUTHOR(S) OF APACHE2NGINX SOFTWARE IS ALSO NOT LIABLE FOR ANY INDIRECT, INCIDENTAL, PUNITIVE, SPECIAL OR CONSEQUENTIAL DAMAGE (INCLUDING LOSS OF BUSINESS, REVENUE, PROFITS, USE, DATA OR OTHER ECONOMIC ADVANTAGE).
 
 THE FUNCTION PROVIDED BY THIS TOOL CAN'T BE GUARANTEED AND ASSURED TO BE ACCURATE. THE PURPOSE OF DESIGNING THIS SOFTWARE IS TO HELP USERS EASILY CONVERTING THE APACHE CONFIGURATION FILES TO NGINX'S. USER SHOULD CHECK WHETHER THE CONVERTED RESULT IS EFFECTIVE OR NOT BEFORE USING IN THE PRODUCTION ENVIRONMENT.

diff --git a/CHANGES b/CHANGES
@@ -0,0 +1,15 @@
+                                                         -*- coding: utf-8 -*-
+Changes with Apache2Nginx 1.0.1
+
+  *) BUGFIX: Transfer httpd.conf with Apache2Nginx, 
+     startup nginx with transferred nginx.conf, 
+	 error happened:[emerg]: duplicate location "/" in nginx.conf.
+
+  *) BUGFIX: "limit_except" directive duplicate in the same location.
+
+  *) BUGFIX: "RedirectMatch" was transferred as "Rewrite ...", 
+     but the regular expression is not in quotation marks.
+
+  *) BUGFIX: When there is unrecognized argument in LogFormat, 
+     the prompt of LogFormat is wrong.
+
diff --git a/LICENSE b/LICENSE
diff --git a/NOTICE b/NOTICE
@@ -0,0 +1,20 @@
+Apache2Nginx tool
+Copyright 2012 NHN China Corp.
+
+This product based on the software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at the National Center
+for Supercomputing Applications (NCSA) at the University of
+Illinois at Urbana-Champaign.
+
+This software contains code derived from the RSA Data Security
+Inc. MD5 Message-Digest Algorithm, including various
+modifications by Spyglass Inc., Carnegie Mellon University, and
+Bell Communications Research, Inc (Bellcore).
+
+Regular expression support is provided by the PCRE library package,
+which is open source software, written by Philip Hazel, and copyright
+by the University of Cambridge, England. The original software is
+available from
+   ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
diff --git a/include/apn_cfgtree.h b/include/apn_cfgtree.h
@@ -14,6 +14,21 @@
  * limitations under the License.
  */
 
+/*
+ * Platform Development Team 2
+ * 9th Floor, Tower B, Fairmont Tower,
+ * No.33 Guangshun North Avenue
+ * Wangjing, Chaoyang District
+ * Beijing, China, 100102
+ * www.nhncorp.cn | cn.naver.com
+ *
+ * Written by: Reed Lee <mailtolide@sina.com>
+ * Copyright (C) 2012, NHN China Corp. 
+ * All rights reserved.
+ *
+ */
+
+
 #ifndef APN_CONFTREE_H
 #define APN_CONFTREE_H
 

diff --git a/include/apn_debug.h b/include/apn_debug.h
@@ -1,10 +1,32 @@
-/** 
- * @file apn_debug.h
- * @brief include some usefull global definition and functions.
- * @author lide, lide@nhn.com
- * @date 2012-04-24
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
+/*
+ * Platform Development Team 2
+ * 9th Floor, Tower B, Fairmont Tower,
+ * No.33 Guangshun North Avenue
+ * Wangjing, Chaoyang District
+ * Beijing, China, 100102
+ * www.nhncorp.cn | cn.naver.com
+ *
+ * Written by: Reed Lee <mailtolide@sina.com>
+ * Copyright (C) 2012, NHN China Corp. 
+ * All rights reserved.
+ *
+ */
 
 #ifndef APN_DEBUG_H
 #define APN_DEBUG_H

diff --git a/include/http_config.h b/include/http_config.h
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 /**
  * @file http_config.h
  * @brief Apache Configuration

diff --git a/include/httpd.h b/include/httpd.h
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 /**
  * @file httpd.h
  * @brief HTTP Daemon routines

diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 #include "apr_strings.h"
 #include "apr_md5.h"            /* for apr_password_validate */
 #include "apr_lib.h"            /* for apr_isspace */

diff --git a/modules/aaa/mod_authn_file.c b/modules/aaa/mod_authn_file.c
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 #include "apr_strings.h"
 #include "apr_md5.h"            /* for apr_password_validate */
 

diff --git a/modules/aaa/mod_authz_host.c b/modules/aaa/mod_authz_host.c
@@ -21,6 +21,11 @@
  *
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   James Lee <jsandjh@gmail.com>
+ */
+
 #include "apr_strings.h"
 #include "apr_network_io.h"
 #include "apr_md5.h"

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
@@ -25,6 +25,11 @@
  * (zlib functions gz_open and gzwrite, check_header)
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 /* zlib flags */
 #define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
 #define HEAD_CRC     0x02 /* bit 1 set: header CRC present */

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
@@ -25,6 +25,11 @@
  * Version sort added by Martin Pool <mbp@humbug.org.au>.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 #include "apr_strings.h"
 #include "apr_fnmatch.h"
 #include "apr_strings.h"

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
@@ -21,6 +21,11 @@
  *
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_lib.h"

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   James Lee <jsandjh@gmail.com>
+ */
+
 /*
  * Modified by djm@va.pubnix.com:
  * If no TransferLog is given explicitly, decline to log.

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
@@ -22,6 +22,11 @@
  *
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   James Lee <jsandjh@gmail.com>
+ */
+
 #include "apr_strings.h"
 #include "apr_lib.h"
 

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   James Lee <jsandjh@gmail.com>
+ */
+
 /*
  * mod_dir.c: handle default index files, and trailing-/ redirects
  */

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
@@ -46,6 +46,11 @@
  *      www.engelschall.com
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   James Lee <jsandjh@gmail.com>
+ */
+
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_hash.h"

diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 /*
  * mod_expires.c
  * version 0.0.11

diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
@@ -23,6 +23,11 @@
  * Based on mod_browser by Alexei Kosut <akosut@organic.com>
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 /*
  * Used to set environment variables based on the incoming request headers,
  * or some selected other attributes of the request (e.g., the remote host

diff --git a/server/apn_cfgtree.c b/server/apn_cfgtree.c
@@ -14,6 +14,21 @@
  * limitations under the License.
  */
 
+/*
+ * Platform Development Team 2
+ * 9th Floor, Tower B, Fairmont Tower,
+ * No.33 Guangshun North Avenue
+ * Wangjing, Chaoyang District
+ * Beijing, China, 100102
+ * www.nhncorp.cn | cn.naver.com
+ *
+ * Written by: Reed Lee <mailtolide@sina.com>
+ * Copyright (C) 2012, NHN China Corp. 
+ * All rights reserved.
+ *
+ */
+
+
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_file_io.h"

diff --git a/server/apn_debug.c b/server/apn_debug.c
@@ -14,6 +14,21 @@
  * limitations under the License.
  */
 
+/*
+ * Platform Development Team 2
+ * 9th Floor, Tower B, Fairmont Tower,
+ * No.33 Guangshun North Avenue
+ * Wangjing, Chaoyang District
+ * Beijing, China, 100102
+ * www.nhncorp.cn | cn.naver.com
+ *
+ * Written by: Reed Lee <mailtolide@sina.com>
+ * Copyright (C) 2012, NHN China Corp. 
+ * All rights reserved.
+ *
+ */
+
+
 #if APR_HAVE_STDARG_H
 #include <stdarg.h>
 #endif

diff --git a/server/config.c b/server/config.c
@@ -29,6 +29,11 @@
  *
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_portable.h"

diff --git a/server/core.c b/server/core.c
@@ -14,6 +14,13 @@
  * limitations under the License.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ *   James Lee <jsandjh@gmail.com>
+ *   Choi Youngseok <zealot33@gmail.com>
+ */
+
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_lib.h"

diff --git a/server/main.c b/server/main.c
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/*
+ * Based on the code of Apache Httpd, Written by: 
+ *   Reed Lee <mailtolide@sina.com>
+ */
+
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_getopt.h"