Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit c918ca57a7233206ec78ac00438eeb6830e3680b 2 parents 71d894c + f7b10ab
David Soria Parra dsp authored
23 .gitattributes
... ... @@ -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
2  README.input_filter
@@ -86,7 +86,7 @@ PHP_MINFO_FUNCTION(my_input_filter)
86 86 {
87 87 php_info_print_table_start();
88 88 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$");
90 90 php_info_print_table_end();
91 91 }
92 92
2  Zend/RFCs/002.txt
... ... @@ -1,5 +1,5 @@
1 1 Title: Zend 2.0 Namespaces
2   -Version: $Revision$
  2 +Version: $Id$
3 3 Status: declined
4 4 Maintainer: Stig S. Bakken <ssb@php.net>
5 5 Created: 2001-09-08
2  Zend/RFCs/003.txt
... ... @@ -1,5 +1,5 @@
1 1 Title: Loose type requirements for functions
2   -Version: $Revision$
  2 +Version: $Id$
3 3 Status: draft
4 4 Maintainer: Brian Moon <brianm@dealnews.com>
5 5 Created: 2001-09-17
2  ext/dba/libcdb/cdb.c
@@ -189,6 +189,6 @@ int cdb_find(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
189 189 /* {{{ cdb_version */
190 190 char *cdb_version()
191 191 {
192   - return "0.75, $Revision$";
  192 + return "0.75, $Id$";
193 193 }
194 194 /* }}} */
2  ext/dba/libcdb/cdb_make.c
@@ -240,5 +240,5 @@ int cdb_make_finish(struct cdb_make *c TSRMLS_DC)
240 240 /* {{{ cdb_make_version */
241 241 char *cdb_make_version()
242 242 {
243   - return "0.75, $Revision$";
  243 + return "0.75, $Id$";
244 244 }
2  ext/dba/libflatfile/flatfile.c
@@ -306,7 +306,7 @@ datum flatfile_nextkey(flatfile *dba TSRMLS_DC) {
306 306 /* {{{ flatfile_version */
307 307 char *flatfile_version()
308 308 {
309   - return "1.0, $Revision$";
  309 + return "1.0, $Id$";
310 310 }
311 311 /* }}} */
312 312
2  ext/dba/libinifile/inifile.c
@@ -42,7 +42,7 @@
42 42 /* {{{ inifile_version */
43 43 char *inifile_version()
44 44 {
45   - return "1.0, $Revision$";
  45 + return "1.0, $Id$";
46 46 }
47 47 /* }}} */
48 48
2  ext/enchant/enchant.c
@@ -326,7 +326,7 @@ PHP_MINFO_FUNCTION(enchant)
326 326 #elif defined(HAVE_ENCHANT_BROKER_SET_PARAM)
327 327 php_info_print_table_row(2, "Libenchant Version", "1.5.0 or later");
328 328 #endif
329   - php_info_print_table_row(2, "Revision", "$Revision$");
  329 + php_info_print_table_row(2, "Revision", "$Id$");
330 330 php_info_print_table_end();
331 331
332 332 php_info_print_table_start();
2  ext/filter/filter.c
@@ -318,7 +318,7 @@ PHP_MINFO_FUNCTION(filter)
318 318 {
319 319 php_info_print_table_start();
320 320 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$");
322 322 php_info_print_table_end();
323 323
324 324 DISPLAY_INI_ENTRIES();
2  ext/iconv/php_iconv.h
@@ -17,7 +17,7 @@
17 17 +----------------------------------------------------------------------+
18 18 */
19 19
20   -/* $Revision$ */
  20 +/* $Id$ */
21 21
22 22 #ifndef PHP_ICONV_H
23 23 #define PHP_ICONV_H
2  ext/mysqlnd/mysqlnd.h
@@ -22,7 +22,7 @@
22 22 #ifndef MYSQLND_H
23 23 #define MYSQLND_H
24 24
25   -#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Revision$"
  25 +#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Id$"
26 26 #define MYSQLND_VERSION_ID 50010
27 27
28 28 #define MYSQLND_PLUGIN_API_VERSION 1
2  ext/oci8/oci8.c
@@ -1341,7 +1341,7 @@ PHP_MINFO_FUNCTION(oci)
1341 1341 php_info_print_table_start();
1342 1342 php_info_print_table_row(2, "OCI8 Support", "enabled");
1343 1343 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$");
1345 1345
1346 1346 snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
1347 1347 php_info_print_table_row(2, "Active Persistent Connections", buf);
2  ext/phar/phar.c
@@ -3667,7 +3667,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
3667 3667 php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
3668 3668 php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
3669 3669 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$");
3671 3671 php_info_print_table_row(2, "Phar-based phar archives", "enabled");
3672 3672 php_info_print_table_row(2, "Tar-based phar archives", "enabled");
3673 3673 php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
2  ext/phar/phar/pharcommand.inc
@@ -1566,7 +1566,7 @@ class PharCommand extends CLICommand
1566 1566 $use_ext = extension_loaded('phar');
1567 1567 $version = array(
1568 1568 'PHP Version' => phpversion(),
1569   - 'phar.phar version' => '$Revision$',
  1569 + 'phar.phar version' => '$Id$',
1570 1570 'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available',
1571 1571 'Phar API version' => Phar::apiVersion(),
1572 1572 'Phar-based phar archives' => true,
2  ext/posix/posix.c
@@ -310,7 +310,7 @@ const zend_function_entry posix_functions[] = {
310 310 static PHP_MINFO_FUNCTION(posix)
311 311 {
312 312 php_info_print_table_start();
313   - php_info_print_table_row(2, "Revision", "$Revision$");
  313 + php_info_print_table_row(2, "Revision", "$Id$");
314 314 php_info_print_table_end();
315 315 }
316 316 /* }}} */
2  ext/recode/recode.c
@@ -135,7 +135,7 @@ PHP_MINFO_FUNCTION(recode)
135 135 {
136 136 php_info_print_table_start();
137 137 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$");
139 139 php_info_print_table_end();
140 140 }
141 141
4 ext/reflection/php_reflection.c
@@ -6072,7 +6072,7 @@ PHP_MINFO_FUNCTION(reflection) /* {{{ */
6072 6072 php_info_print_table_start();
6073 6073 php_info_print_table_header(2, "Reflection", "enabled");
6074 6074
6075   - php_info_print_table_row(2, "Version", "$Revision$");
  6075 + php_info_print_table_row(2, "Version", "$Id$");
6076 6076
6077 6077 php_info_print_table_end();
6078 6078 } /* }}} */
@@ -6086,7 +6086,7 @@ zend_module_entry reflection_module_entry = { /* {{{ */
6086 6086 NULL,
6087 6087 NULL,
6088 6088 PHP_MINFO(reflection),
6089   - "$Revision$",
  6089 + "$Id$",
6090 6090 STANDARD_MODULE_PROPERTIES
6091 6091 }; /* }}} */
6092 6092
2  ext/simplexml/simplexml.c
@@ -2638,7 +2638,7 @@ PHP_MINFO_FUNCTION(simplexml)
2638 2638 {
2639 2639 php_info_print_table_start();
2640 2640 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$");
2642 2642 php_info_print_table_row(2, "Schema support",
2643 2643 #ifdef LIBXML_SCHEMAS_ENABLED
2644 2644 "enabled");
2  ext/skeleton/create_stubs
@@ -67,7 +67,7 @@ BEGIN {
67 67
68 68
69 69 xmlhead = "<?xml version='1.0' encoding='iso-8859-1'?>\n" \
70   - "<!-- $Revision$ -->\n" \
  70 + "<!-- $Id$ -->\n" \
71 71 " <reference id=\"ref." extname "\">\n" \
72 72 " <title> functions</title>\n" \
73 73 " <titleabbrev></titleabbrev>\n\n" \
2  ext/sysvmsg/sysvmsg.c
@@ -145,7 +145,7 @@ PHP_MINFO_FUNCTION(sysvmsg)
145 145 {
146 146 php_info_print_table_start();
147 147 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$");
149 149 php_info_print_table_end();
150 150 }
151 151 /* }}} */
2  run-tests.php
@@ -666,7 +666,7 @@ function save_or_mail_results()
666 666 $html_output = is_resource($html_file);
667 667 break;
668 668 case '--version':
669   - echo '$Revision$' . "\n";
  669 + echo '$Id$' . "\n";
670 670 exit(1);
671 671
672 672 default:
2  sapi/continuity/capi.c
@@ -110,7 +110,7 @@ PHP_MSHUTDOWN_FUNCTION(continuity)
110 110 PHP_MINFO_FUNCTION(continuity)
111 111 {
112 112 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$");
114 114 php_info_print_table_row(2, "Server Version", conFget_build());
115 115 #ifdef CONTINUITY_CDPEXT
116 116 php_info_print_table_row(2,"CDP Extensions", "enabled");
2  sapi/nsapi/nsapi.c
@@ -312,7 +312,7 @@ PHP_MSHUTDOWN_FUNCTION(nsapi)
312 312 PHP_MINFO_FUNCTION(nsapi)
313 313 {
314 314 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$");
316 316 php_info_print_table_row(2, "Server Software", system_version());
317 317 php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
318 318 (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 comments on commit c918ca5

Please sign in to comment.
Something went wrong with that request. Please try again.