You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/08/24 18:40:00 UTC

git commit: TS-2155 New RAT exclude file, and cleanup

Updated Branches:
  refs/heads/master f63b27d52 -> 9cc6fe6d4


TS-2155 New RAT exclude file, and cleanup

This creates a new RAT exclude file, using the regular expression syntax that
newer versions of RAT seems to like. This also cleans up some of the licenses
and adds a few where they were missing. No code / source was modified, so this
does not need to get backported.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9cc6fe6d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9cc6fe6d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9cc6fe6d

Branch: refs/heads/master
Commit: 9cc6fe6d41ebde0b99a0bf465976b647545d273b
Parents: f63b27d
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sat Aug 24 10:28:01 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sat Aug 24 10:28:01 2013 -0600

----------------------------------------------------------------------
 CHANGES                                         | 16 ++--
 ci/coverity-model.cc                            | 18 +++++
 ci/rat-regex.txt                                | 39 +++++++++
 doc/arch/cache/cache-api.en.rst                 | 17 ++++
 doc/arch/cache/cache-appendix.en.rst            | 17 ++++
 doc/arch/cache/cache-glossary.en.rst            | 17 ++++
 doc/arch/cache/common.defs                      | 17 ++++
 doc/arch/cache/tier-storage.en.rst              | 17 ++++
 doc/ext/traffic-server.py                       | 17 ++++
 iocore/cache/Notes                              | 18 +++++
 mgmt/stats/spec                                 | 18 +++++
 proxy/msgs/TSMessages.mc                        | 83 --------------------
 proxy/msgs/TSMsgs.rc                            | 39 ---------
 tools/lighttpd_mod_generator/Makefile           | 20 +++++
 .../conf/lighttpd_11.conf                       | 17 ++++
 .../conf/lighttpd_13.conf                       | 17 ++++
 .../conf/lighttpd_15.conf                       | 17 ++++
 .../conf/lighttpd_17.conf                       | 17 ++++
 .../conf/lighttpd_19.conf                       | 17 ++++
 .../conf/lighttpd_20.conf                       | 17 ++++
 .../conf/lighttpd_22.conf                       | 17 ++++
 .../conf/lighttpd_24.conf                       | 17 ++++
 .../lighttpd_mod_generator/conf/lighttpd_3.conf | 17 ++++
 .../lighttpd_mod_generator/conf/lighttpd_5.conf | 16 ++++
 .../lighttpd_mod_generator/conf/lighttpd_7.conf | 16 ++++
 .../lighttpd_mod_generator/conf/lighttpd_9.conf | 16 ++++
 26 files changed, 427 insertions(+), 127 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 6a62e60..0fec2af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,13 +2,19 @@
 Changes with Apache Traffic Server 4.1.0
 
 
-  *) [TS-2148] handle_cache_operation_on_forward_server_response ignores value of api_server_response_no_store
-    Author: Corey Cossentino <co...@cossentino.com>
+  *) [TS-2155] Make a new RAT exclude file that uses the regular expressions
+   now supported. Also cleanup some of minor licensing discrepancies.
 
-  *) [TS-2147] Set server_share_sessions to 1 for 'internal' transactions in rfc5861 plugin.
+  *) [TS-2148] handle_cache_operation_on_forward_server_response ignores value
+    of api_server_response_no_store.
+    Author: Corey Cossentino <co...@cossentino.com> 
 
-  *) [TS-2107] split proxy.config.http.transaction_active_timeout_in to proxy.config.http.transaction_header_timeout_in
-     and proxy.config.http.transaction_request_timeout_in.
+  *) [TS-2147] Set server_share_sessions to 1 for 'internal' transactions in
+   rfc5861 plugin.
+
+  *) [TS-2107] split proxy.config.http.transaction_active_timeout_in to
+     proxy.config.http.transaction_header_timeout_in and
+     proxy.config.http.transaction_request_timeout_in. 
 
   *) [TS-2114] buffer_upload plugin defines true and false
     Author: Kit Chan <ch...@gmail.com>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/ci/coverity-model.cc
----------------------------------------------------------------------
diff --git a/ci/coverity-model.cc b/ci/coverity-model.cc
index 9b83d0c..1f952a3 100644
--- a/ci/coverity-model.cc
+++ b/ci/coverity-model.cc
@@ -1,3 +1,21 @@
+/** 
+    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.
+*/
+
 // This is for PCRE, where the offsets vector is considered uninitialized, but it's an
 //  output vector only (input doesn't matter).
 extern "C" {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/ci/rat-regex.txt
----------------------------------------------------------------------
diff --git a/ci/rat-regex.txt b/ci/rat-regex.txt
new file mode 100644
index 0000000..c01cf2e
--- /dev/null
+++ b/ci/rat-regex.txt
@@ -0,0 +1,39 @@
+BUILDS
+autom4te.cache
+build
+build-aux
+body_factory
+blib
+.*\.txt$
+.*\.cfg$
+.*\.in$
+.*\.dot$
+.*\.svg$
+.*\.sed$
+.*\.dtd$
+.*\.tsconfig$
+.clang-format
+.*\.default$
+.*\.default\.in$
+.*\.config$
+.gitignore
+.indent.pro
+.vimrc
+CHANGES
+LAYOUT
+README.*$
+TODO
+REVIEWERS
+MANIFEST
+configure
+ink_rand\.cc
+ink_rand\.h
+ink_res_init\.cc
+ink_res_mkquery\.cc
+hashtable.cc
+logstats\.json
+logstats\.summary
+test_AIO.sample
+stale_while_revalidate.conf
+stats\.memo
+port\.h

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/doc/arch/cache/cache-api.en.rst
----------------------------------------------------------------------
diff --git a/doc/arch/cache/cache-api.en.rst b/doc/arch/cache/cache-api.en.rst
index f289697..ebdf372 100755
--- a/doc/arch/cache/cache-api.en.rst
+++ b/doc/arch/cache/cache-api.en.rst
@@ -1,3 +1,20 @@
+.. 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.
+
 .. include:: common.defs
 
 ===========================

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/doc/arch/cache/cache-appendix.en.rst
----------------------------------------------------------------------
diff --git a/doc/arch/cache/cache-appendix.en.rst b/doc/arch/cache/cache-appendix.en.rst
index 39b8e79..a4c247b 100755
--- a/doc/arch/cache/cache-appendix.en.rst
+++ b/doc/arch/cache/cache-appendix.en.rst
@@ -1,3 +1,20 @@
+.. 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.
+
 .. include:: common.defs
 
 Cache Tools

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/doc/arch/cache/cache-glossary.en.rst
----------------------------------------------------------------------
diff --git a/doc/arch/cache/cache-glossary.en.rst b/doc/arch/cache/cache-glossary.en.rst
index 6603895..7c433aa 100755
--- a/doc/arch/cache/cache-glossary.en.rst
+++ b/doc/arch/cache/cache-glossary.en.rst
@@ -1,3 +1,20 @@
+.. 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.
+
 Glossary
 ~~~~~~~~
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/doc/arch/cache/common.defs
----------------------------------------------------------------------
diff --git a/doc/arch/cache/common.defs b/doc/arch/cache/common.defs
index 7229c8a..5ac36e9 100644
--- a/doc/arch/cache/common.defs
+++ b/doc/arch/cache/common.defs
@@ -1,3 +1,20 @@
+.. 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.
+
 .. Global definitions
 
 .. Files in github. Should write a custom domain so we can do :ts:git:`iocore/cache/P_CacheDir.h`

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/doc/arch/cache/tier-storage.en.rst
----------------------------------------------------------------------
diff --git a/doc/arch/cache/tier-storage.en.rst b/doc/arch/cache/tier-storage.en.rst
index d7d5e81..006474b 100755
--- a/doc/arch/cache/tier-storage.en.rst
+++ b/doc/arch/cache/tier-storage.en.rst
@@ -1,3 +1,20 @@
+.. 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.
+
 ==============================
 Tiered Storage Design
 ==============================

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/doc/ext/traffic-server.py
----------------------------------------------------------------------
diff --git a/doc/ext/traffic-server.py b/doc/ext/traffic-server.py
index 4adfb8f..bae9c6b 100644
--- a/doc/ext/traffic-server.py
+++ b/doc/ext/traffic-server.py
@@ -1,4 +1,21 @@
 # -*- coding: utf-8 -*-
+#
+# 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.
+
 """
     TS Sphinx Directives
     ~~~~~~~~~~~~~~~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/iocore/cache/Notes
----------------------------------------------------------------------
diff --git a/iocore/cache/Notes b/iocore/cache/Notes
index f26843a..0992d25 100644
--- a/iocore/cache/Notes
+++ b/iocore/cache/Notes
@@ -1,3 +1,21 @@
+/*
+  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.
+*/
+
 proxy/cluster/Cluster.h is now iocore/cluster/P_ClusterCache.h
 Clustering compiles but only works if this module is compiled with the entire
 TS because there are a lot of stuff required for clustering in proxy/http.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/mgmt/stats/spec
----------------------------------------------------------------------
diff --git a/mgmt/stats/spec b/mgmt/stats/spec
index a56d7a9..97bdb90 100644
--- a/mgmt/stats/spec
+++ b/mgmt/stats/spec
@@ -5,6 +5,24 @@
 // Last Update: 04/11/2001
 //
 //-----------------------------------------------------------------------------
+// -*- coding: utf-8 -*-
+//
+// 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.
+
 
 //-----------------------------------------------------------------------------
 // Design

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/proxy/msgs/TSMessages.mc
----------------------------------------------------------------------
diff --git a/proxy/msgs/TSMessages.mc b/proxy/msgs/TSMessages.mc
deleted file mode 100644
index 72a4226..0000000
--- a/proxy/msgs/TSMessages.mc
+++ /dev/null
@@ -1,83 +0,0 @@
-;//
-;#ifndef _TSMESSAGES_H_
-;#define _TSMESSAGES_H_
-;//
-MessageIdTypedef=DWORD
-;//
-;//     Traffic Server messages
-;//
-;#define CAT_TS 1
-MessageId=0x1
-Language=English
-TrafficServer
-.
-;//
-;//     Traffic Server messages
-;//
-MessageId=10001
-Severity=Informational
-Facility=Application
-SymbolicName=TRAFFIC_SERVER
-Language=English
-TRAFFIC SERVER %1
-.
-;//
-;//     Perfutil messages
-;//
-MessageId=1900
-Severity=Informational
-Facility=Application
-SymbolicName=UTIL_LOG_OPEN
-Language=English
-An extensible counter has opened the Event Log for MEMCTRS.DLL
-.
-;//
-MessageId=1999
-Severity=Informational
-Facility=Application
-SymbolicName=UTIL_CLOSING_LOG
-Language=English
-An extensible counter has closed the Event Log for MEMCTRS.DLL
-.
-;//
-MessageId=2000
-Severity=Error
-Facility=Application
-SymbolicName=APPMEM_OPEN_FILE_MAPPING_ERROR
-Language=English
-Unable to open mapped file containing Application Memory performance data.
-.
-;//
-MessageId=+1
-Severity=Error
-Facility=Application
-SymbolicName=APPMEM_UNABLE_MAP_VIEW_OF_FILE
-Language=English
-Unable to map to shared memory file containing Application Memory performance data.
-.
-;//
-MessageId=+1
-Severity=Error
-Facility=Application
-SymbolicName=APPMEM_UNABLE_OPEN_DRIVER_KEY
-Language=English
-Unable open "Performance" key of Applicationa Memory Performace Driver in registy. Status code is returned in data.
-.
-;//
-MessageId=+1
-Severity=Error
-Facility=Application
-SymbolicName=APPMEM_UNABLE_READ_FIRST_COUNTER
-Language=English
-Unable to read the "First Counter" value under the AppMem\Performance Key. Status codes retuened in data.
-.
-;//
-MessageId=+1
-Severity=Error
-Facility=Application
-SymbolicName=APPMEM_UNABLE_READ_FIRST_HELP
-Language=English
-Unable to read the "First Help" value under the AppMem\Performance Key. Status codes retuened in data.
-.
-;//
-;#endif // _TSMESSAGES_H_

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/proxy/msgs/TSMsgs.rc
----------------------------------------------------------------------
diff --git a/proxy/msgs/TSMsgs.rc b/proxy/msgs/TSMsgs.rc
deleted file mode 100644
index f4ee3f3..0000000
--- a/proxy/msgs/TSMsgs.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-1 VERSIONINFO
- FILEVERSION 0,0,0,1
- PRODUCTVERSION 0,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0xbL
-#else
- FILEFLAGS 0xaL
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "Message File\0"
-            VALUE "FileVersion", "0, 0, 0, 1\0"
-            VALUE "InternalName", "TSMsgs.dll\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "Traffic Server (TM)\0"
-            VALUE "OriginalFilename", "TSMsgs.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Traffic Server Message File\0"
-            VALUE "ProductVersion", "0, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#include "TSMessages.rc"
-

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/Makefile
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/Makefile b/tools/lighttpd_mod_generator/Makefile
index 9d3205d..d1f722d 100644
--- a/tools/lighttpd_mod_generator/Makefile
+++ b/tools/lighttpd_mod_generator/Makefile
@@ -1,3 +1,23 @@
+#
+# Makefile for building the lighttpd mod_generator enabled version
+# of lighttpd.
+#
+#  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.
+
 VERSION=1.4.30
 
 all: mod_generator.so

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_11.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_11.conf b/tools/lighttpd_mod_generator/conf/lighttpd_11.conf
index d28daf8..2c17bb3 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_11.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_11.conf
@@ -1,3 +1,20 @@
+#
+# 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.
+
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_13.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_13.conf b/tools/lighttpd_mod_generator/conf/lighttpd_13.conf
index 8a168a7..480e427 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_13.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_13.conf
@@ -1,3 +1,20 @@
+#
+# 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.
+
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_15.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_15.conf b/tools/lighttpd_mod_generator/conf/lighttpd_15.conf
index 6765acc..9a9b4d6 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_15.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_15.conf
@@ -1,3 +1,20 @@
+#
+# 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.
+
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_17.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_17.conf b/tools/lighttpd_mod_generator/conf/lighttpd_17.conf
index 0a93742..9f249d3 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_17.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_17.conf
@@ -1,3 +1,20 @@
+#
+# 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.
+
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_19.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_19.conf b/tools/lighttpd_mod_generator/conf/lighttpd_19.conf
index c009998..b0e1c73 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_19.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_19.conf
@@ -1,3 +1,20 @@
+#
+# 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.
+
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_20.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_20.conf b/tools/lighttpd_mod_generator/conf/lighttpd_20.conf
index a509628..ae9b571 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_20.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_20.conf
@@ -1,3 +1,20 @@
+#
+# 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.
+
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_22.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_22.conf b/tools/lighttpd_mod_generator/conf/lighttpd_22.conf
index 4ac554f..f6ed2b0 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_22.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_22.conf
@@ -1,3 +1,20 @@
+#
+# 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.
+
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_24.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_24.conf b/tools/lighttpd_mod_generator/conf/lighttpd_24.conf
index 11d9188..5765be6 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_24.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_24.conf
@@ -1,3 +1,20 @@
+#
+# 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.
+
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_3.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_3.conf b/tools/lighttpd_mod_generator/conf/lighttpd_3.conf
index 0901ed8..db154e4 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_3.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_3.conf
@@ -1,3 +1,20 @@
+#
+# 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.
+
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_5.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_5.conf b/tools/lighttpd_mod_generator/conf/lighttpd_5.conf
index 6b85bf4..c2f6761 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_5.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_5.conf
@@ -1,3 +1,19 @@
+#
+# 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.
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_7.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_7.conf b/tools/lighttpd_mod_generator/conf/lighttpd_7.conf
index 5b00234..b59e56f 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_7.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_7.conf
@@ -1,3 +1,19 @@
+#
+# 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.
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9cc6fe6d/tools/lighttpd_mod_generator/conf/lighttpd_9.conf
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/conf/lighttpd_9.conf b/tools/lighttpd_mod_generator/conf/lighttpd_9.conf
index 373117d..88ff31c 100644
--- a/tools/lighttpd_mod_generator/conf/lighttpd_9.conf
+++ b/tools/lighttpd_mod_generator/conf/lighttpd_9.conf
@@ -1,3 +1,19 @@
+#
+# 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.
 server.document-root = "/usr/local/share/lighttpd"
 server.modules += ( "mod_redirect", "mod_accesslog", "mod_generator")