Adjust copyrights.

grisha · Sep 5, 2024 · 4315a40 · 4315a40
1 parent 51f359d
commit 4315a40
Show file tree

Hide file tree

Showing 50 changed files with 89 additions and 117 deletions.
diff --git a/Doc/copyright.rst b/Doc/copyright.rst
@@ -4,7 +4,7 @@ Copyright
 
 Mod_python and this documentation is:
 
-Copyright © 2000, 2001, 2013 Gregory Trubetskoy
+Copyright © 2000, 2001, 2013, 2024 Gregory Trubetskoy
 
 Copyright © 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
 

diff --git a/Makefile.in b/Makefile.in
@@ -1,4 +1,4 @@
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -80,7 +80,7 @@ distclean: clean
 	cd scripts && $(MAKE) distclean
 	cd test && $(MAKE) distclean
 	rm -rf Makefile config.h config.status config.cache config.log \
-		test/testconf.py 
+		test/testconf.py
 
 test:	@ALL@
 	cd test && $(MAKE) test
diff --git a/configure.in b/configure.in
@@ -1,4 +1,4 @@
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/lib/python/mod_python/Cookie.py b/lib/python/mod_python/Cookie.py
@@ -1,6 +1,6 @@
  # vim: set sw=4 expandtab :
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/lib/python/mod_python/Session.py b/lib/python/mod_python/Session.py
@@ -1,6 +1,6 @@
  # vim: set sw=4 expandtab :
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/lib/python/mod_python/__init__.py b/lib/python/mod_python/__init__.py
@@ -1,5 +1,5 @@
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -30,5 +30,3 @@
     # httpdconf, so we fail silently
     from . import apache
 except: pass
-
-
diff --git a/lib/python/mod_python/apache.py b/lib/python/mod_python/apache.py
@@ -1,6 +1,6 @@
  # vim: set sw=4 expandtab :
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/lib/python/mod_python/cache.py b/lib/python/mod_python/cache.py
@@ -1,5 +1,5 @@
 #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/lib/python/mod_python/cgihandler.py b/lib/python/mod_python/cgihandler.py
@@ -1,5 +1,5 @@
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/lib/python/mod_python/httpdconf.py b/lib/python/mod_python/httpdconf.py
@@ -1,5 +1,5 @@
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/lib/python/mod_python/psp.py b/lib/python/mod_python/psp.py
@@ -1,6 +1,6 @@
  # vim: set sw=4 expandtab :
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -475,4 +475,3 @@ def get(self, filename, mtime):
             return None
 
 mem_fcache = FileCache()
-
diff --git a/lib/python/mod_python/publisher.py b/lib/python/mod_python/publisher.py
@@ -1,5 +1,5 @@
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/lib/python/mod_python/python22.py b/lib/python/mod_python/python22.py
@@ -1,5 +1,5 @@
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -22,6 +22,6 @@
 import sys
 if sys.version < '2.3':
     import builtins as hack
-    
+
     # Enumerate does not exists in Python 2.2
     hack.enumerate = lambda s : list(zip(list(range(len(s))),s))
diff --git a/lib/python/mod_python/testhandler.py b/lib/python/mod_python/testhandler.py
@@ -1,5 +1,5 @@
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/lib/python/mod_python/util.py b/lib/python/mod_python/util.py
@@ -1,6 +1,6 @@
  # vim: set sw=4 expandtab :
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/lib/python/mod_python/wsgi.py b/lib/python/mod_python/wsgi.py
@@ -1,5 +1,5 @@
  #
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -76,5 +76,3 @@ def handler(req):
             getattr(response, 'close', lambda: None)()
 
     return apache.OK
-
-
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
@@ -1,4 +1,4 @@
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/scripts/mod_python.in b/scripts/mod_python.in
@@ -1,6 +1,6 @@
 #!@PYTHON_BIN@
 
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -163,5 +163,3 @@ if __name__ == "__main__":
 ### Local Variables:
 ### mode:python
 ### End:
-
-
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -1,4 +1,4 @@
- # Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ # Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  #
  #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/_apachemodule.c b/src/_apachemodule.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -853,12 +853,12 @@ PyObject *_apache_module_init()
 #else
     m = PyModule_Create(&_apache_moduledef);
     PyObject *name = PyUnicode_FromString("_apache");
-    
+
     _PyImport_FixupExtensionObject(m, name, name
 #if PY_MINOR_VERSION >= 7
-				   ,PyImport_GetModuleDict()
+                   ,PyImport_GetModuleDict()
 #endif
-				   );
+                   );
 #endif
     d = PyModule_GetDict(m);
     Mp_ServerReturn = PyErr_NewException("_apache.SERVER_RETURN", NULL, NULL);

diff --git a/src/_pspmodule.c b/src/_pspmodule.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/connobject.c b/src/connobject.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/filterobject.c b/src/filterobject.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -569,4 +569,3 @@ PyTypeObject MpFilter_Type = {
     0,                              /* tp_as_mapping*/
     0,                              /* tp_hash*/
 };
-
diff --git a/src/finfoobject.c b/src/finfoobject.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/hlist.c b/src/hlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -148,4 +148,3 @@ void hlist_extend(apr_pool_t *p, hl_entry *hle1,
         hle2 = hle2->next;
     }
 }
-
diff --git a/src/hlistobject.c b/src/hlistobject.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -179,5 +179,3 @@ PyTypeObject MpHList_Type = {
     0,                               /* tp_as_mapping*/
     0,                               /* tp_hash*/
 };
-
-
diff --git a/src/include/_apachemodule.h b/src/include/_apachemodule.h
@@ -2,7 +2,7 @@
 #define Mp_APACHEMODULE_H
 
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/include/_pspmodule.h b/src/include/_pspmodule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -31,4 +31,3 @@
 #endif
 
 #endif /* __PSP_MODULE_H */
-
diff --git a/src/include/connobject.h b/src/include/connobject.h
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/include/filterobject.h b/src/include/filterobject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/include/finfoobject.h b/src/include/finfoobject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/include/hlist.h b/src/include/hlist.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
- * 
+ *
  * Licensed 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
@@ -17,10 +17,10 @@
  * Originally developed by Gregory Trubetskoy.
  *
  *
- * hlist.h 
+ * hlist.h
  *
  *
- * See accompanying documentation and source code comments 
+ * See accompanying documentation and source code comments
  * for details.
  *
  */
@@ -43,9 +43,9 @@ extern "C" {
                          no error should be reported */
         struct hl_entry *next;
     } hl_entry;
-    
-    hl_entry *hlist_new(apr_pool_t *p, const char *h, const char *d, 
-                        char d_is_fnmatch, char d_is_location, 
+
+    hl_entry *hlist_new(apr_pool_t *p, const char *h, const char *d,
+                        char d_is_fnmatch, char d_is_location,
                         ap_regex_t *regex, const char silent);
     hl_entry *hlist_append(apr_pool_t *p, hl_entry *hle, const char * h,
                            const char *d, char d_is_fnmatch, char d_is_location,

diff --git a/src/include/hlistobject.h b/src/include/hlistobject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/include/mod_python.h b/src/include/mod_python.h
@@ -2,7 +2,7 @@
 #define Mp_MOD_PYTHON_H
 
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -22,8 +22,6 @@
  *
  * mod_python.h
  *
- * $Id: mod_python.h 231054 2005-08-09 15:37:04Z jgallacher $
- *
  * See accompanying documentation and source code comments
  * for details.
  *

diff --git a/src/include/mod_python.h.in b/src/include/mod_python.h.in
@@ -2,7 +2,7 @@
 #define Mp_MOD_PYTHON_H
 
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/include/psp_parser.h b/src/include/psp_parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you

diff --git a/src/include/psp_string.h b/src/include/psp_string.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2000, 2001, 2013 Gregory Trubetskoy
+ * Copyright (C) 2000, 2001, 2013, 2024 Gregory Trubetskoy
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apache Software Foundation
- * 
+ *
  * Licensed 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
@@ -41,4 +41,3 @@ void psp_string_clear(psp_string *);
 void psp_string_free(psp_string *);
 
 #endif /* __PSP_STRING_H */
-