archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.3' into PHP-5.4

Browse source 
* 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
This commit is contained in:
David Soria Parra 2012-03-20 17:58:58 +01:00
commit c918ca57a7
24 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.gitattributes vendored Normal file
View file

@ -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

2
README.input_filter
View file

@ -86,7 +86,7 @@ PHP_MINFO_FUNCTION(my_input_filter)
{ {
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_row( 2, "My Input Filter Support", "enabled" ); 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(); php_info_print_table_end();
} }

2
Zend/RFCs/002.txt
View file

@ -1,5 +1,5 @@
Title: Zend 2.0 Namespaces Title: Zend 2.0 Namespaces
Version: $Revision$ Version: $Id$
Status: declined Status: declined
Maintainer: Stig S. Bakken <ssb@php.net> Maintainer: Stig S. Bakken <ssb@php.net>
Created: 2001-09-08 Created: 2001-09-08

2
Zend/RFCs/003.txt
View file

@ -1,5 +1,5 @@
Title: Loose type requirements for functions Title: Loose type requirements for functions
Version: $Revision$ Version: $Id$
Status: draft Status: draft
Maintainer: Brian Moon <brianm@dealnews.com> Maintainer: Brian Moon <brianm@dealnews.com>
Created: 2001-09-17 Created: 2001-09-17

2
ext/dba/libcdb/cdb.c
View file

@ -189,6 +189,6 @@ int cdb_find(struct cdb *c, char *key, unsigned int len TSRMLS_DC)
/* {{{ cdb_version */ /* {{{ cdb_version */
char *cdb_version() char *cdb_version()
{ {
return "0.75, $Revision$"; return "0.75, $Id$";
} }
/* }}} */ /* }}} */

2
ext/dba/libcdb/cdb_make.c
View file

@ -240,5 +240,5 @@ int cdb_make_finish(struct cdb_make *c TSRMLS_DC)
/* {{{ cdb_make_version */ /* {{{ cdb_make_version */
char *cdb_make_version() char *cdb_make_version()
{ {
return "0.75, $Revision$"; return "0.75, $Id$";
} }

2
ext/dba/libflatfile/flatfile.c
View file

@ -306,7 +306,7 @@ datum flatfile_nextkey(flatfile *dba TSRMLS_DC) {
/* {{{ flatfile_version */ /* {{{ flatfile_version */
char *flatfile_version() char *flatfile_version()
{ {
return "1.0, $Revision$"; return "1.0, $Id$";
} }
/* }}} */ /* }}} */

2
ext/dba/libinifile/inifile.c
View file

@ -42,7 +42,7 @@
/* {{{ inifile_version */ /* {{{ inifile_version */
char *inifile_version() char *inifile_version()
{ {
return "1.0, $Revision$"; return "1.0, $Id$";
} }
/* }}} */ /* }}} */

2
ext/enchant/enchant.c
View file

@ -326,7 +326,7 @@ PHP_MINFO_FUNCTION(enchant)
#elif defined(HAVE_ENCHANT_BROKER_SET_PARAM) #elif defined(HAVE_ENCHANT_BROKER_SET_PARAM)
php_info_print_table_row(2, "Libenchant Version", "1.5.0 or later"); php_info_print_table_row(2, "Libenchant Version", "1.5.0 or later");
#endif #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_end();
php_info_print_table_start(); php_info_print_table_start();

2
ext/filter/filter.c
View file

@ -318,7 +318,7 @@ PHP_MINFO_FUNCTION(filter)
{ {
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); 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(); php_info_print_table_end();
DISPLAY_INI_ENTRIES(); DISPLAY_INI_ENTRIES();

2
ext/iconv/php_iconv.h
View file

@ -17,7 +17,7 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
/* $Revision$ */ /* $Id$ */
#ifndef PHP_ICONV_H #ifndef PHP_ICONV_H
#define PHP_ICONV_H #define PHP_ICONV_H

2
ext/mysqlnd/mysqlnd.h
View file

@ -22,7 +22,7 @@
#ifndef MYSQLND_H #ifndef MYSQLND_H
#define 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_VERSION_ID 50010
#define MYSQLND_PLUGIN_API_VERSION 1 #define MYSQLND_PLUGIN_API_VERSION 1

2
ext/oci8/oci8.c
View file

@ -1341,7 +1341,7 @@ PHP_MINFO_FUNCTION(oci)
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled"); 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, "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)); snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf); php_info_print_table_row(2, "Active Persistent Connections", buf);

2
ext/phar/phar.c
View file

@ -3667,7 +3667,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled"); 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 EXT version", PHP_PHAR_VERSION);
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_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, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-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"); php_info_print_table_row(2, "ZIP-based phar archives", "enabled");

2
ext/phar/phar/pharcommand.inc
View file

@ -1566,7 +1566,7 @@ class PharCommand extends CLICommand
$use_ext = extension_loaded('phar'); $use_ext = extension_loaded('phar');
$version = array( $version = array(
'PHP Version' => phpversion(), 'PHP Version' => phpversion(),
'phar.phar version' => '$Revision$', 'phar.phar version' => '$Id$',
'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available', 'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available',
'Phar API version' => Phar::apiVersion(), 'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true, 'Phar-based phar archives' => true,

2
ext/posix/posix.c
View file

@ -310,7 +310,7 @@ const zend_function_entry posix_functions[] = {
static PHP_MINFO_FUNCTION(posix) static PHP_MINFO_FUNCTION(posix)
{ {
php_info_print_table_start(); 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(); php_info_print_table_end();
} }
/* }}} */ /* }}} */

2
ext/recode/recode.c
View file

@ -135,7 +135,7 @@ PHP_MINFO_FUNCTION(recode)
{ {
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_row(2, "Recode Support", "enabled"); 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(); php_info_print_table_end();
} }

4
ext/reflection/php_reflection.c
View file

@ -6072,7 +6072,7 @@ PHP_MINFO_FUNCTION(reflection) /* {{{ */
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled"); 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(); php_info_print_table_end();
} /* }}} */ } /* }}} */
@ -6086,7 +6086,7 @@ zend_module_entry reflection_module_entry = { /* {{{ */
NULL, NULL,
NULL, NULL,
PHP_MINFO(reflection), PHP_MINFO(reflection),
"$Revision$", "$Id$",
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
}; /* }}} */ }; /* }}} */

2
ext/simplexml/simplexml.c
View file

@ -2638,7 +2638,7 @@ PHP_MINFO_FUNCTION(simplexml)
{ {
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled"); 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", php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED #ifdef LIBXML_SCHEMAS_ENABLED
"enabled"); "enabled");

2
ext/skeleton/create_stubs
View file

@ -67,7 +67,7 @@ BEGIN {
xmlhead = "<?xml version='1.0' encoding='iso-8859-1'?>\n" \ xmlhead = "<?xml version='1.0' encoding='iso-8859-1'?>\n" \
"<!-- $Revision$ -->\n" \ "<!-- $Id$ -->\n" \
" <reference id=\"ref." extname "\">\n" \ " <reference id=\"ref." extname "\">\n" \
" <title> functions</title>\n" \ " <title> functions</title>\n" \
" <titleabbrev></titleabbrev>\n\n" \ " <titleabbrev></titleabbrev>\n\n" \

2
ext/sysvmsg/sysvmsg.c
View file

@ -145,7 +145,7 @@ PHP_MINFO_FUNCTION(sysvmsg)
{ {
php_info_print_table_start(); php_info_print_table_start();
php_info_print_table_row(2, "sysvmsg support", "enabled"); 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(); php_info_print_table_end();
} }
/* }}} */ /* }}} */

2
run-tests.php
View file

@ -666,7 +666,7 @@ if (isset($argc) && $argc > 1) {
$html_output = is_resource($html_file); $html_output = is_resource($html_file);
break; break;
case '--version': case '--version':
echo '$Revision$' . "\n"; echo '$Id$' . "\n";
exit(1); exit(1);
default: default:

2
sapi/continuity/capi.c
View file

@ -110,7 +110,7 @@ PHP_MSHUTDOWN_FUNCTION(continuity)
PHP_MINFO_FUNCTION(continuity) PHP_MINFO_FUNCTION(continuity)
{ {
php_info_print_table_start(); 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()); php_info_print_table_row(2, "Server Version", conFget_build());
#ifdef CONTINUITY_CDPEXT #ifdef CONTINUITY_CDPEXT
php_info_print_table_row(2,"CDP Extensions", "enabled"); php_info_print_table_row(2,"CDP Extensions", "enabled");

2
sapi/nsapi/nsapi.c
View file

@ -312,7 +312,7 @@ PHP_MSHUTDOWN_FUNCTION(nsapi)
PHP_MINFO_FUNCTION(nsapi) PHP_MINFO_FUNCTION(nsapi)
{ {
php_info_print_table_start(); 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, "Server Software", system_version());
php_info_print_table_row(2, "Sub-requests with nsapi_virtual()", 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" ); (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" );