diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-07-03 02:52:16 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-07-25 00:53:25 +0200 |
| commit | 8d3f8ca12a0b00f2a74a27424790222536235502 (patch) | |
| tree | f35ddbdb8b5bc9259712d0275cb461ab7de9b7b9 /sapi | |
| parent | dcd6a6ff367a91f8c03303a4dc2e3c8b17d692ed (diff) | |
| download | php-git-8d3f8ca12a0b00f2a74a27424790222536235502.tar.gz | |
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.
Diffstat (limited to 'sapi')
39 files changed, 7 insertions, 76 deletions
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" diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 350846d7f7..71ed2fd98d 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -21,8 +21,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "php.h" #include "php_globals.h" #include "php_variables.h" diff --git a/sapi/cgi/config.w32 b/sapi/cgi/config.w32 index 4e803fb1c4..5f7b040b63 100644 --- a/sapi/cgi/config.w32 +++ b/sapi/cgi/config.w32 @@ -1,5 +1,4 @@ // vim:ft=javascript -// $Id$ ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes'); diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 index 1935864be3..bdf9edbdc1 100644 --- a/sapi/cgi/config9.m4 +++ b/sapi/cgi/config9.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for sapi cgi PHP_ARG_ENABLE(cgi,, [ --disable-cgi Disable building CGI version of PHP], yes, no) diff --git a/sapi/cli/cli.h b/sapi/cli/cli.h index a02d6241dc..5cc39ff00b 100644 --- a/sapi/cli/cli.h +++ b/sapi/cli/cli.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef CLI_H #define CLI_H diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index 21681512a7..7382963959 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for sapi cli PHP_ARG_ENABLE(cli,, [ --disable-cli Disable building CLI version of PHP diff --git a/sapi/cli/config.w32 b/sapi/cli/config.w32 index 7d0e5954ff..ba55be2218 100644 --- a/sapi/cli/config.w32 +++ b/sapi/cli/config.w32 @@ -1,5 +1,4 @@ // vim:ft=javascript -// $Id$ ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes'); ARG_ENABLE('crt-debug', 'Enable CRT memory dumps for debugging sent to STDERR', 'no'); diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index d67cefca9f..00bc1d793c 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -20,8 +20,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "php.h" #include "php_globals.h" #include "php_variables.h" diff --git a/sapi/cli/php_cli_process_title.c b/sapi/cli/php_cli_process_title.c index c1074ebf19..a85370cbd5 100644 --- a/sapi/cli/php_cli_process_title.c +++ b/sapi/cli/php_cli_process_title.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/sapi/cli/php_cli_process_title.h b/sapi/cli/php_cli_process_title.h index 854dec6165..8882e3cd0e 100644 --- a/sapi/cli/php_cli_process_title.h +++ b/sapi/cli/php_cli_process_title.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef PHP_PS_TITLE_HEADER #define PHP_PS_TITLE_HEADER diff --git a/sapi/cli/ps_title.h b/sapi/cli/ps_title.h index 69e791061c..bc18470ce1 100644 --- a/sapi/cli/ps_title.h +++ b/sapi/cli/ps_title.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef PS_TITLE_HEADER #define PS_TITLE_HEADER diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4 index 5be7af48f4..d396a070e8 100644 --- a/sapi/embed/config.m4 +++ b/sapi/embed/config.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for sapi embed PHP_ARG_ENABLE(embed,, [ --enable-embed[=TYPE] EXPERIMENTAL: Enable building of embedded SAPI library diff --git a/sapi/embed/config.w32 b/sapi/embed/config.w32 index ce41e253f0..394982126c 100644 --- a/sapi/embed/config.w32 +++ b/sapi/embed/config.w32 @@ -1,5 +1,4 @@ // vim:ft=javascript -// $Id$ ARG_ENABLE('embed', 'Embedded SAPI library', 'no'); diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 109d908ef2..6b21825ba0 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -15,7 +15,6 @@ | Author: Edin Kadribasic <edink@php.net> | +----------------------------------------------------------------------+ */ -/* $Id$ */ #include "php_embed.h" #include "ext/standard/php_standard.h" diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h index 7f35e623a2..15c311e2b3 100644 --- a/sapi/embed/php_embed.h +++ b/sapi/embed/php_embed.h @@ -15,7 +15,6 @@ | Author: Edin Kadribasic <edink@php.net> | +----------------------------------------------------------------------+ */ -/* $Id$ */ #ifndef _PHP_EMBED_H_ #define _PHP_EMBED_H_ diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index 8a9c60a4f9..c9e98216f8 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for sapi fpm PHP_ARG_ENABLE(fpm,, [ --enable-fpm Enable building of the fpm SAPI executable], no, no) diff --git a/sapi/fpm/fpm/events/devpoll.c b/sapi/fpm/fpm/events/devpoll.c index fe6f93f794..e3f73bf126 100644 --- a/sapi/fpm/fpm/events/devpoll.c +++ b/sapi/fpm/fpm/events/devpoll.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "../fpm_config.h" #include "../fpm_events.h" #include "../fpm.h" diff --git a/sapi/fpm/fpm/events/devpoll.h b/sapi/fpm/fpm/events/devpoll.h index 91599e4fb7..08730744ab 100644 --- a/sapi/fpm/fpm/events/devpoll.h +++ b/sapi/fpm/fpm/events/devpoll.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef FPM_EVENTS_DEVPOLL_H #define FPM_EVENTS_DEVPOLL_H diff --git a/sapi/fpm/fpm/events/epoll.c b/sapi/fpm/fpm/events/epoll.c index c7b47375e9..e4a3300e4d 100644 --- a/sapi/fpm/fpm/events/epoll.c +++ b/sapi/fpm/fpm/events/epoll.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "../fpm_config.h" #include "../fpm_events.h" #include "../fpm.h" diff --git a/sapi/fpm/fpm/events/epoll.h b/sapi/fpm/fpm/events/epoll.h index 696f56cdfc..4896178a58 100644 --- a/sapi/fpm/fpm/events/epoll.h +++ b/sapi/fpm/fpm/events/epoll.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef FPM_EVENTS_EPOLL_H #define FPM_EVENTS_EPOLL_H diff --git a/sapi/fpm/fpm/events/kqueue.c b/sapi/fpm/fpm/events/kqueue.c index 87eb5d7f70..f0bb98ec21 100644 --- a/sapi/fpm/fpm/events/kqueue.c +++ b/sapi/fpm/fpm/events/kqueue.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "../fpm_config.h" #include "../fpm_events.h" #include "../fpm.h" diff --git a/sapi/fpm/fpm/events/kqueue.h b/sapi/fpm/fpm/events/kqueue.h index 7255c5cae7..abb329e980 100644 --- a/sapi/fpm/fpm/events/kqueue.h +++ b/sapi/fpm/fpm/events/kqueue.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef FPM_EVENTS_KQUEUE_H #define FPM_EVENTS_KQUEUE_H diff --git a/sapi/fpm/fpm/events/poll.c b/sapi/fpm/fpm/events/poll.c index b9f62b8499..28bcf0c403 100644 --- a/sapi/fpm/fpm/events/poll.c +++ b/sapi/fpm/fpm/events/poll.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "../fpm_config.h" #include "../fpm_events.h" #include "../fpm.h" diff --git a/sapi/fpm/fpm/events/poll.h b/sapi/fpm/fpm/events/poll.h index 983077060f..c8cac2b367 100644 --- a/sapi/fpm/fpm/events/poll.h +++ b/sapi/fpm/fpm/events/poll.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef FPM_EVENTS_POLL_H #define FPM_EVENTS_POLL_H diff --git a/sapi/fpm/fpm/events/port.c b/sapi/fpm/fpm/events/port.c index 7940285dfa..bb9441369c 100644 --- a/sapi/fpm/fpm/events/port.c +++ b/sapi/fpm/fpm/events/port.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "../fpm_config.h" #include "../fpm_events.h" #include "../fpm.h" diff --git a/sapi/fpm/fpm/events/port.h b/sapi/fpm/fpm/events/port.h index 210112c450..28aee47f02 100644 --- a/sapi/fpm/fpm/events/port.h +++ b/sapi/fpm/fpm/events/port.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef FPM_EVENTS_PORT_H #define FPM_EVENTS_PORT_H diff --git a/sapi/fpm/fpm/events/select.c b/sapi/fpm/fpm/events/select.c index 5f1a02abf2..c0fd8bc085 100644 --- a/sapi/fpm/fpm/events/select.c +++ b/sapi/fpm/fpm/events/select.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #include "../fpm_config.h" #include "../fpm_events.h" #include "../fpm.h" diff --git a/sapi/fpm/fpm/events/select.h b/sapi/fpm/fpm/events/select.h index cad01df3fc..6490fe2c18 100644 --- a/sapi/fpm/fpm/events/select.h +++ b/sapi/fpm/fpm/events/select.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef FPM_EVENTS_SELECT_H #define FPM_EVENTS_SELECT_H diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c index 2df0714409..b104288ff4 100644 --- a/sapi/fpm/fpm/fpm_status.c +++ b/sapi/fpm/fpm/fpm_status.c @@ -1,5 +1,4 @@ - /* $Id$ */ /* (c) 2009 Jerome Loyet */ #include "php.h" diff --git a/sapi/fpm/fpm/fpm_status.h b/sapi/fpm/fpm/fpm_status.h index 79caf694cc..8d91b44a06 100644 --- a/sapi/fpm/fpm/fpm_status.h +++ b/sapi/fpm/fpm/fpm_status.h @@ -1,5 +1,4 @@ - /* $Id$ */ /* (c) 2009 Jerome Loyet */ #ifndef FPM_STATUS_H diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in index 77914a6f2b..7b5aedc425 100644 --- a/sapi/fpm/status.html.in +++ b/sapi/fpm/status.html.in @@ -1,7 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <!-- - $Id$ (c) 2011 Jerome Loyet The PHP License, version 3.01 This is sample real-time status page for FPM. You can change it to better fit your needs. diff --git a/sapi/litespeed/config.m4 b/sapi/litespeed/config.m4 index 268b9aecde..b5bf664f3f 100644 --- a/sapi/litespeed/config.m4 +++ b/sapi/litespeed/config.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for sapi litespeed AC_MSG_CHECKING(for LiteSpeed support) diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4 index 965a110bbe..7a4103b24d 100644 --- a/sapi/phpdbg/config.m4 +++ b/sapi/phpdbg/config.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for sapi phpdbg PHP_ARG_ENABLE(phpdbg, for phpdbg support, [ --enable-phpdbg Build phpdbg], yes, yes) |