From 8d3f8ca12a0b00f2a74a27424790222536235502 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 3 Jul 2018 02:52:16 +0200 Subject: Remove unused Git attributes ident The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore. --- sapi/apache2handler/apache_config.c | 2 -- sapi/apache2handler/config.m4 | 4 +--- sapi/apache2handler/config.w32 | 1 - sapi/apache2handler/mod_php7.c | 2 -- sapi/apache2handler/php_apache.h | 2 -- sapi/apache2handler/php_functions.c | 2 -- sapi/apache2handler/sapi_apache2.c | 2 -- 7 files changed, 1 insertion(+), 14 deletions(-) (limited to 'sapi/apache2handler') diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index 05c9e85828..4c9c80f942 100644 --- a/sapi/apache2handler/apache_config.c +++ b/sapi/apache2handler/apache_config.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 3176700287..25d1d9f5ac 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for sapi apache2handler PHP_ARG_WITH(apxs2,, [ --with-apxs2[=FILE] Build shared Apache 2.0 Handler module. FILE is the optional diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index 8ea1305d4f..5166135b0a 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -1,5 +1,4 @@ // vim:ft=javascript -// $Id$ ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no'); diff --git a/sapi/apache2handler/mod_php7.c b/sapi/apache2handler/mod_php7.c index 3f0e7d5da9..e2f96592cc 100644 --- a/sapi/apache2handler/mod_php7.c +++ b/sapi/apache2handler/mod_php7.c @@ -18,8 +18,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index c93e20c90f..ae5e5972cc 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef PHP_APACHE_H #define PHP_APACHE_H diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index eebc88567e..9ab3ad57fa 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index a4ee0cdcf6..a198cddec9 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -18,8 +18,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" -- cgit v1.2.1