Skip to content

Commit c918ca5

Browse files
dspdsp
committed
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Replace $Revision$ with $Id$ in keyword expansion enable files Enable $Id$ expansion for files with the $Revision$ keyword Conflicts: ext/mysqlnd/mysqlnd.h
2 parents 71d894c + f7b10ab commit c918ca5

File tree

24 files changed

+47
-24
lines changed

24 files changed

+47
-24
lines changed

‎.gitattributes

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
ext/mysqlnd/mysqlnd.h ident
2+
ext/simplexml/simplexml.c ident
3+
ext/iconv/php_iconv.h ident
4+
ext/posix/posix.c ident
5+
ext/recode/recode.c ident
6+
ext/skeleton/create_stubs ident
7+
ext/phar/phar/pharcommand.inc ident
8+
ext/phar/phar.c ident
9+
ext/sysvmsg/sysvmsg.c ident
10+
ext/enchant/enchant.c ident
11+
ext/reflection/php_reflection.c ident
12+
ext/oci8/oci8.c ident
13+
ext/dba/libinifile/inifile.c ident
14+
ext/dba/libflatfile/flatfile.c ident
15+
ext/dba/libcdb/cdb_make.c ident
16+
ext/dba/libcdb/cdb.c ident
17+
ext/filter/filter.c ident
18+
README.input_filter ident
19+
run-tests.php ident
20+
sapi/nsapi/nsapi.c ident
21+
sapi/continuity/capi.c ident
22+
Zend/RFCs/002.txt ident
23+
Zend/RFCs/003.txt ident

‎README.input_filter

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ PHP_MINFO_FUNCTION(my_input_filter)
8686
{
8787
php_info_print_table_start();
8888
php_info_print_table_row( 2, "My Input Filter Support", "enabled" );
89-
php_info_print_table_row( 2, "Revision", "$Revision$");
89+
php_info_print_table_row( 2, "Revision", "$Id$");
9090
php_info_print_table_end();
9191
}
9292

‎Zend/RFCs/002.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Title: Zend 2.0 Namespaces
2-
Version: $Revision$
2+
Version: $Id$
33
Status: declined
44
Maintainer: Stig S. Bakken <[email protected]>
55
Created: 2001-09-08

‎Zend/RFCs/003.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Title: Loose type requirements for functions
2-
Version: $Revision$
2+
Version: $Id$
33
Status: draft
44
Maintainer: Brian Moon <[email protected]>
55
Created: 2001-09-17

‎ext/dba/libcdb/cdb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,6 @@ int cdb_find(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
189189
/* {{{ cdb_version */
190190
char *cdb_version()
191191
{
192-
return "0.75, $Revision$";
192+
return "0.75, $Id$";
193193
}
194194
/* }}} */

‎ext/dba/libcdb/cdb_make.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,5 +240,5 @@ int cdb_make_finish(struct cdb_make *c TSRMLS_DC)
240240
/* {{{ cdb_make_version */
241241
char *cdb_make_version()
242242
{
243-
return "0.75, $Revision$";
243+
return "0.75, $Id$";
244244
}

‎ext/dba/libflatfile/flatfile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ datum flatfile_nextkey(flatfile *dba TSRMLS_DC) {
306306
/* {{{ flatfile_version */
307307
char *flatfile_version()
308308
{
309-
return "1.0, $Revision$";
309+
return "1.0, $Id$";
310310
}
311311
/* }}} */
312312

‎ext/dba/libinifile/inifile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
/* {{{ inifile_version */
4343
char *inifile_version()
4444
{
45-
return "1.0, $Revision$";
45+
return "1.0, $Id$";
4646
}
4747
/* }}} */
4848

‎ext/enchant/enchant.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ PHP_MINFO_FUNCTION(enchant)
326326
#elif defined(HAVE_ENCHANT_BROKER_SET_PARAM)
327327
php_info_print_table_row(2, "Libenchant Version", "1.5.0 or later");
328328
#endif
329-
php_info_print_table_row(2, "Revision", "$Revision$");
329+
php_info_print_table_row(2, "Revision", "$Id$");
330330
php_info_print_table_end();
331331

332332
php_info_print_table_start();

‎ext/filter/filter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ PHP_MINFO_FUNCTION(filter)
318318
{
319319
php_info_print_table_start();
320320
php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" );
321-
php_info_print_table_row( 2, "Revision", "$Revision$");
321+
php_info_print_table_row( 2, "Revision", "$Id$");
322322
php_info_print_table_end();
323323

324324
DISPLAY_INI_ENTRIES();

‎ext/iconv/php_iconv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
+----------------------------------------------------------------------+
1818
*/
1919

20-
/* $Revision$ */
20+
/* $Id$ */
2121

2222
#ifndef PHP_ICONV_H
2323
#define PHP_ICONV_H

‎ext/mysqlnd/mysqlnd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#ifndef MYSQLND_H
2323
#define MYSQLND_H
2424

25-
#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Revision$"
25+
#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Id$"
2626
#define MYSQLND_VERSION_ID 50010
2727

2828
#define MYSQLND_PLUGIN_API_VERSION 1

‎ext/oci8/oci8.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ PHP_MINFO_FUNCTION(oci)
13411341
php_info_print_table_start();
13421342
php_info_print_table_row(2, "OCI8 Support", "enabled");
13431343
php_info_print_table_row(2, "Version", PHP_OCI8_VERSION);
1344-
php_info_print_table_row(2, "Revision", "$Revision$");
1344+
php_info_print_table_row(2, "Revision", "$Id$");
13451345

13461346
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
13471347
php_info_print_table_row(2, "Active Persistent Connections", buf);

‎ext/phar/phar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3667,7 +3667,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
36673667
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
36683668
php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
36693669
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
3670-
php_info_print_table_row(2, "SVN revision", "$Revision$");
3670+
php_info_print_table_row(2, "SVN revision", "$Id$");
36713671
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
36723672
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
36733673
php_info_print_table_row(2, "ZIP-based phar archives", "enabled");

‎ext/phar/phar/pharcommand.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,7 @@ class PharCommand extends CLICommand
15661566
$use_ext = extension_loaded('phar');
15671567
$version = array(
15681568
'PHP Version' => phpversion(),
1569-
'phar.phar version' => '$Revision$',
1569+
'phar.phar version' => '$Id$',
15701570
'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available',
15711571
'Phar API version' => Phar::apiVersion(),
15721572
'Phar-based phar archives' => true,

‎ext/posix/posix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ const zend_function_entry posix_functions[] = {
310310
static PHP_MINFO_FUNCTION(posix)
311311
{
312312
php_info_print_table_start();
313-
php_info_print_table_row(2, "Revision", "$Revision$");
313+
php_info_print_table_row(2, "Revision", "$Id$");
314314
php_info_print_table_end();
315315
}
316316
/* }}} */

‎ext/recode/recode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ PHP_MINFO_FUNCTION(recode)
135135
{
136136
php_info_print_table_start();
137137
php_info_print_table_row(2, "Recode Support", "enabled");
138-
php_info_print_table_row(2, "Revision", "$Revision$");
138+
php_info_print_table_row(2, "Revision", "$Id$");
139139
php_info_print_table_end();
140140
}
141141

‎ext/reflection/php_reflection.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -6072,7 +6072,7 @@ PHP_MINFO_FUNCTION(reflection) /* {{{ */
60726072
php_info_print_table_start();
60736073
php_info_print_table_header(2, "Reflection", "enabled");
60746074

6075-
php_info_print_table_row(2, "Version", "$Revision$");
6075+
php_info_print_table_row(2, "Version", "$Id$");
60766076

60776077
php_info_print_table_end();
60786078
} /* }}} */
@@ -6086,7 +6086,7 @@ zend_module_entry reflection_module_entry = { /* {{{ */
60866086
NULL,
60876087
NULL,
60886088
PHP_MINFO(reflection),
6089-
"$Revision$",
6089+
"$Id$",
60906090
STANDARD_MODULE_PROPERTIES
60916091
}; /* }}} */
60926092

‎ext/simplexml/simplexml.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2638,7 +2638,7 @@ PHP_MINFO_FUNCTION(simplexml)
26382638
{
26392639
php_info_print_table_start();
26402640
php_info_print_table_header(2, "Simplexml support", "enabled");
2641-
php_info_print_table_row(2, "Revision", "$Revision$");
2641+
php_info_print_table_row(2, "Revision", "$Id$");
26422642
php_info_print_table_row(2, "Schema support",
26432643
#ifdef LIBXML_SCHEMAS_ENABLED
26442644
"enabled");

‎ext/skeleton/create_stubs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ BEGIN {
6767

6868

6969
xmlhead = "<?xml version='1.0' encoding='iso-8859-1'?>\n" \
70-
"<!-- $Revision$ -->\n" \
70+
"<!-- $Id$ -->\n" \
7171
" <reference id=\"ref." extname "\">\n" \
7272
" <title> functions</title>\n" \
7373
" <titleabbrev></titleabbrev>\n\n" \

‎ext/sysvmsg/sysvmsg.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ PHP_MINFO_FUNCTION(sysvmsg)
145145
{
146146
php_info_print_table_start();
147147
php_info_print_table_row(2, "sysvmsg support", "enabled");
148-
php_info_print_table_row(2, "Revision", "$Revision$");
148+
php_info_print_table_row(2, "Revision", "$Id$");
149149
php_info_print_table_end();
150150
}
151151
/* }}} */

‎run-tests.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ function save_or_mail_results()
666666
$html_output = is_resource($html_file);
667667
break;
668668
case '--version':
669-
echo '$Revision$' . "\n";
669+
echo '$Id$' . "\n";
670670
exit(1);
671671

672672
default:

‎sapi/continuity/capi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ PHP_MSHUTDOWN_FUNCTION(continuity)
110110
PHP_MINFO_FUNCTION(continuity)
111111
{
112112
php_info_print_table_start();
113-
php_info_print_table_row(2, "Continuity Module Revision", "$Revision$");
113+
php_info_print_table_row(2, "Continuity Module Revision", "$Id$");
114114
php_info_print_table_row(2, "Server Version", conFget_build());
115115
#ifdef CONTINUITY_CDPEXT
116116
php_info_print_table_row(2,"CDP Extensions", "enabled");

‎sapi/nsapi/nsapi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ PHP_MSHUTDOWN_FUNCTION(nsapi)
312312
PHP_MINFO_FUNCTION(nsapi)
313313
{
314314
php_info_print_table_start();
315-
php_info_print_table_row(2, "NSAPI Module Revision", "$Revision$");
315+
php_info_print_table_row(2, "NSAPI Module Revision", "$Id$");
316316
php_info_print_table_row(2, "Server Software", system_version());
317317
php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
318318
(nsapi_servact_service)?((zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0))?"not supported with zlib.output_compression":"enabled"):"not supported on this platform" );

0 commit comments

Comments
 (0)