Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
@dsp dsp authored
View
23 .gitattributes
@@ -0,0 +1,23 @@
+ext/mysqlnd/mysqlnd.h ident
+ext/simplexml/simplexml.c ident
+ext/iconv/php_iconv.h ident
+ext/posix/posix.c ident
+ext/recode/recode.c ident
+ext/skeleton/create_stubs ident
+ext/phar/phar/pharcommand.inc ident
+ext/phar/phar.c ident
+ext/sysvmsg/sysvmsg.c ident
+ext/enchant/enchant.c ident
+ext/reflection/php_reflection.c ident
+ext/oci8/oci8.c ident
+ext/dba/libinifile/inifile.c ident
+ext/dba/libflatfile/flatfile.c ident
+ext/dba/libcdb/cdb_make.c ident
+ext/dba/libcdb/cdb.c ident
+ext/filter/filter.c ident
+README.input_filter ident
+run-tests.php ident
+sapi/nsapi/nsapi.c ident
+sapi/continuity/capi.c ident
+Zend/RFCs/002.txt ident
+Zend/RFCs/003.txt ident
View
2  README.input_filter
@@ -86,7 +86,7 @@ PHP_MINFO_FUNCTION(my_input_filter)
{
php_info_print_table_start();
php_info_print_table_row( 2, "My Input Filter Support", "enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision$");
+ php_info_print_table_row( 2, "Revision", "$Id$");
php_info_print_table_end();
}
View
2  Zend/RFCs/002.txt
@@ -1,5 +1,5 @@
Title: Zend 2.0 Namespaces
-Version: $Revision$
+Version: $Id$
Status: declined
Maintainer: Stig S. Bakken <ssb@php.net>
Created: 2001-09-08
View
2  Zend/RFCs/003.txt
@@ -1,5 +1,5 @@
Title: Loose type requirements for functions
-Version: $Revision$
+Version: $Id$
Status: draft
Maintainer: Brian Moon <brianm@dealnews.com>
Created: 2001-09-17
View
2  ext/dba/libcdb/cdb.c
@@ -189,6 +189,6 @@ int cdb_find(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
/* {{{ cdb_version */
char *cdb_version()
{
- return "0.75, $Revision$";
+ return "0.75, $Id$";
}
/* }}} */
View
2  ext/dba/libcdb/cdb_make.c
@@ -240,5 +240,5 @@ int cdb_make_finish(struct cdb_make *c TSRMLS_DC)
/* {{{ cdb_make_version */
char *cdb_make_version()
{
- return "0.75, $Revision$";
+ return "0.75, $Id$";
}
View
2  ext/dba/libflatfile/flatfile.c
@@ -306,7 +306,7 @@ datum flatfile_nextkey(flatfile *dba TSRMLS_DC) {
/* {{{ flatfile_version */
char *flatfile_version()
{
- return "1.0, $Revision$";
+ return "1.0, $Id$";
}
/* }}} */
View
2  ext/dba/libinifile/inifile.c
@@ -42,7 +42,7 @@
/* {{{ inifile_version */
char *inifile_version()
{
- return "1.0, $Revision$";
+ return "1.0, $Id$";
}
/* }}} */
View
2  ext/enchant/enchant.c
@@ -326,7 +326,7 @@ PHP_MINFO_FUNCTION(enchant)
#elif defined(HAVE_ENCHANT_BROKER_SET_PARAM)
php_info_print_table_row(2, "Libenchant Version", "1.5.0 or later");
#endif
- php_info_print_table_row(2, "Revision", "$Revision$");
+ php_info_print_table_row(2, "Revision", "$Id$");
php_info_print_table_end();
php_info_print_table_start();
View
2  ext/filter/filter.c
@@ -318,7 +318,7 @@ PHP_MINFO_FUNCTION(filter)
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision$");
+ php_info_print_table_row( 2, "Revision", "$Id$");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
View
2  ext/iconv/php_iconv.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Revision$ */
+/* $Id$ */
#ifndef PHP_ICONV_H
#define PHP_ICONV_H
View
2  ext/mysqlnd/mysqlnd.h
@@ -22,7 +22,7 @@
#ifndef MYSQLND_H
#define MYSQLND_H
-#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Revision$"
+#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Id$"
#define MYSQLND_VERSION_ID 50010
#define MYSQLND_PLUGIN_API_VERSION 1
View
2  ext/oci8/oci8.c
@@ -1341,7 +1341,7 @@ PHP_MINFO_FUNCTION(oci)
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", PHP_OCI8_VERSION);
- php_info_print_table_row(2, "Revision", "$Revision$");
+ php_info_print_table_row(2, "Revision", "$Id$");
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
View
2  ext/phar/phar.c
@@ -3667,7 +3667,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, "SVN revision", "$Revision$");
+ php_info_print_table_row(2, "SVN revision", "$Id$");
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
View
2  ext/phar/phar/pharcommand.inc
@@ -1566,7 +1566,7 @@ class PharCommand extends CLICommand
$use_ext = extension_loaded('phar');
$version = array(
'PHP Version' => phpversion(),
- 'phar.phar version' => '$Revision$',
+ 'phar.phar version' => '$Id$',
'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available',
'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true,
View
2  ext/posix/posix.c
@@ -310,7 +310,7 @@ const zend_function_entry posix_functions[] = {
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision$");
+ php_info_print_table_row(2, "Revision", "$Id$");
php_info_print_table_end();
}
/* }}} */
View
2  ext/recode/recode.c
@@ -135,7 +135,7 @@ PHP_MINFO_FUNCTION(recode)
{
php_info_print_table_start();
php_info_print_table_row(2, "Recode Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision$");
+ php_info_print_table_row(2, "Revision", "$Id$");
php_info_print_table_end();
}
View
4 ext/reflection/php_reflection.c
@@ -6072,7 +6072,7 @@ PHP_MINFO_FUNCTION(reflection) /* {{{ */
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Revision$");
+ php_info_print_table_row(2, "Version", "$Id$");
php_info_print_table_end();
} /* }}} */
@@ -6086,7 +6086,7 @@ zend_module_entry reflection_module_entry = { /* {{{ */
NULL,
NULL,
PHP_MINFO(reflection),
- "$Revision$",
+ "$Id$",
STANDARD_MODULE_PROPERTIES
}; /* }}} */
View
2  ext/simplexml/simplexml.c
@@ -2638,7 +2638,7 @@ PHP_MINFO_FUNCTION(simplexml)
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision$");
+ php_info_print_table_row(2, "Revision", "$Id$");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
View
2  ext/skeleton/create_stubs
@@ -67,7 +67,7 @@ BEGIN {
xmlhead = "<?xml version='1.0' encoding='iso-8859-1'?>\n" \
- "<!-- $Revision$ -->\n" \
+ "<!-- $Id$ -->\n" \
" <reference id=\"ref." extname "\">\n" \
" <title> functions</title>\n" \
" <titleabbrev></titleabbrev>\n\n" \
View
2  ext/sysvmsg/sysvmsg.c
@@ -145,7 +145,7 @@ PHP_MINFO_FUNCTION(sysvmsg)
{
php_info_print_table_start();
php_info_print_table_row(2, "sysvmsg support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision$");
+ php_info_print_table_row(2, "Revision", "$Id$");
php_info_print_table_end();
}
/* }}} */
View
2  run-tests.php
@@ -666,7 +666,7 @@ function save_or_mail_results()
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision$' . "\n";
+ echo '$Id$' . "\n";
exit(1);
default:
View
2  sapi/continuity/capi.c
@@ -110,7 +110,7 @@ PHP_MSHUTDOWN_FUNCTION(continuity)
PHP_MINFO_FUNCTION(continuity)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Continuity Module Revision", "$Revision$");
+ php_info_print_table_row(2, "Continuity Module Revision", "$Id$");
php_info_print_table_row(2, "Server Version", conFget_build());
#ifdef CONTINUITY_CDPEXT
php_info_print_table_row(2,"CDP Extensions", "enabled");
View
2  sapi/nsapi/nsapi.c
@@ -312,7 +312,7 @@ PHP_MSHUTDOWN_FUNCTION(nsapi)
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, "NSAPI Module Revision", "$Revision$");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Id$");
php_info_print_table_row(2, "Server Software", system_version());
php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
(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" );
Please sign in to comment.
Something went wrong with that request. Please try again.