diff options
author | David Soria Parra <dsp@php.net> | 2012-03-20 17:58:58 +0100 |
---|---|---|
committer | David Soria Parra <dsp@php.net> | 2012-03-20 17:58:58 +0100 |
commit | c918ca57a7233206ec78ac00438eeb6830e3680b (patch) | |
tree | 6a0b5e4ea85c7a53a15231cfc7291837d9ea9c09 /ext | |
parent | 71d894cd421d96517618e9d33dfea640499c8ffd (diff) | |
parent | f7b10abae939412e8b5cab69cd579e071deb446b (diff) | |
download | php-git-c918ca57a7233206ec78ac00438eeb6830e3680b.tar.gz |
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
Diffstat (limited to 'ext')
-rw-r--r-- | ext/dba/libcdb/cdb.c | 2 | ||||
-rw-r--r-- | ext/dba/libcdb/cdb_make.c | 2 | ||||
-rw-r--r-- | ext/dba/libflatfile/flatfile.c | 2 | ||||
-rw-r--r-- | ext/dba/libinifile/inifile.c | 2 | ||||
-rwxr-xr-x | ext/enchant/enchant.c | 2 | ||||
-rw-r--r-- | ext/filter/filter.c | 2 | ||||
-rw-r--r-- | ext/iconv/php_iconv.h | 2 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd.h | 2 | ||||
-rw-r--r-- | ext/oci8/oci8.c | 2 | ||||
-rw-r--r-- | ext/phar/phar.c | 2 | ||||
-rwxr-xr-x | ext/phar/phar/pharcommand.inc | 2 | ||||
-rw-r--r-- | ext/posix/posix.c | 2 | ||||
-rw-r--r-- | ext/recode/recode.c | 2 | ||||
-rw-r--r-- | ext/reflection/php_reflection.c | 4 | ||||
-rw-r--r-- | ext/simplexml/simplexml.c | 2 | ||||
-rwxr-xr-x | ext/skeleton/create_stubs | 2 | ||||
-rw-r--r-- | ext/sysvmsg/sysvmsg.c | 2 |
17 files changed, 18 insertions, 18 deletions
diff --git a/ext/dba/libcdb/cdb.c b/ext/dba/libcdb/cdb.c index a4a04474cc..5c26b4fd9f 100644 --- a/ext/dba/libcdb/cdb.c +++ b/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$"; } /* }}} */ diff --git a/ext/dba/libcdb/cdb_make.c b/ext/dba/libcdb/cdb_make.c index e6e7f6f557..600b8dd0f9 100644 --- a/ext/dba/libcdb/cdb_make.c +++ b/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$"; } diff --git a/ext/dba/libflatfile/flatfile.c b/ext/dba/libflatfile/flatfile.c index e81b8ea1de..bf851847d5 100644 --- a/ext/dba/libflatfile/flatfile.c +++ b/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$"; } /* }}} */ diff --git a/ext/dba/libinifile/inifile.c b/ext/dba/libinifile/inifile.c index 4c85087aca..35930d1028 100644 --- a/ext/dba/libinifile/inifile.c +++ b/ext/dba/libinifile/inifile.c @@ -42,7 +42,7 @@ /* {{{ inifile_version */ char *inifile_version() { - return "1.0, $Revision$"; + return "1.0, $Id$"; } /* }}} */ diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index c85c22c88a..2d784ebbef 100755 --- a/ext/enchant/enchant.c +++ b/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(); diff --git a/ext/filter/filter.c b/ext/filter/filter.c index f2aae47d1e..e523cdc882 100644 --- a/ext/filter/filter.c +++ b/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(); diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h index 42210d4a24..8024fda080 100644 --- a/ext/iconv/php_iconv.h +++ b/ext/iconv/php_iconv.h @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Revision$ */ +/* $Id$ */ #ifndef PHP_ICONV_H #define PHP_ICONV_H diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 11aea7a82d..b0b3b15c69 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/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 diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index f323d3e672..bf2eaf558b 100644 --- a/ext/oci8/oci8.c +++ b/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); diff --git a/ext/phar/phar.c b/ext/phar/phar.c index d9d9b08e11..2a47d3d035 100644 --- a/ext/phar/phar.c +++ b/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"); diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc index 9a111b8d83..9e968694c3 100755 --- a/ext/phar/phar/pharcommand.inc +++ b/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, diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 8e49c52d35..967584c6fa 100644 --- a/ext/posix/posix.c +++ b/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(); } /* }}} */ diff --git a/ext/recode/recode.c b/ext/recode/recode.c index fdbc4d0d5f..e17429b238 100644 --- a/ext/recode/recode.c +++ b/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(); } diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 28184e1cc6..1cf65cee16 100644 --- a/ext/reflection/php_reflection.c +++ b/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 }; /* }}} */ diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 334dcd4181..455280fc74 100644 --- a/ext/simplexml/simplexml.c +++ b/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"); diff --git a/ext/skeleton/create_stubs b/ext/skeleton/create_stubs index 0a5f28607e..f9f39b1795 100755 --- a/ext/skeleton/create_stubs +++ b/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" \ diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index 9ba10cb3a7..6360183f00 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/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(); } /* }}} */ |