mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'php/master'

Browse Source
This commit is contained in:
Anatol Belski 2014-08-21 09:21:31 +02:00
commit 8d6ef99a39
6 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_builtin_functions.c
View File

@ -1701,7 +1701,7 @@ static int copy_class_or_interface_name(zval *el TSRMLS_DC, int num_args, va_lis
if ((hash_key->key && hash_key->key->val[0] != 0)
&& (comply_mask == (ce->ce_flags & mask))) {
if (ce->refcount > 1 &&
(ce->name->len != hash_key->key->len - 1 ||
(ce->name->len != hash_key->key->len ||
!same_name(hash_key->key->val, ce->name->val, ce->name->len))) {
add_next_index_str(array, STR_COPY(hash_key->key));
} else {

9
Zend/zend_iterators.c
View File

@ -24,13 +24,14 @@
static zend_class_entry zend_iterator_class_entry;
static void iter_wrapper_free(zend_object *object TSRMLS_DC);
static void iter_wrapper_dtor(zend_object *object TSRMLS_DC);
static zend_object_handlers iterator_object_handlers = {
0,
iter_wrapper_free,
iter_wrapper_dtor,
NULL,
NULL,
NULL, /* prop read */
NULL, /* prop write */
NULL, /* read dim */
@ -58,12 +59,16 @@ ZEND_API void zend_register_iterator_wrapper(TSRMLS_D)
INIT_CLASS_ENTRY(zend_iterator_class_entry, "__iterator_wrapper", NULL);
}
static void iter_wrapper_dtor(zend_object *object TSRMLS_DC)
static void iter_wrapper_free(zend_object *object TSRMLS_DC)
{
zend_object_iterator *iter = (zend_object_iterator*)object;
iter->funcs->dtor(iter TSRMLS_CC);
}
static void iter_wrapper_dtor(zend_object *object TSRMLS_DC)
{
}
ZEND_API void zend_iterator_init(zend_object_iterator *iter TSRMLS_DC)
{
zend_object_std_init(&iter->std, &zend_iterator_class_entry TSRMLS_CC);

34
sapi/cli/php.1.in
View File

@ -1,24 +1,24 @@
.TH PHP 1 "2014" "The PHP Group" "Scripting Language"
.TH @program_prefix@php 1 "2014" "The PHP Group" "Scripting Language"
.SH NAME
php \- PHP Command Line Interface 'CLI'
@program_prefix@php \- PHP Command Line Interface 'CLI'
.P
php-cgi \- PHP Common Gateway Interface 'CGI' command
@program_prefix@php-cgi \- PHP Common Gateway Interface 'CGI' command
.SH SYNOPSIS
.B php
.B @program_prefix@php
[options] [
.B \-f\fP ]
.IR file
[[\-\-]
.IR args.\|.\|. ]
.LP
.B php
.B @program_prefix@php
[options]
.B \-r
.IR code
[[\-\-]
.IR args.\|.\|. ]
.LP
.B php
.B @program_prefix@php
[options] [\-B
.IR begin_code ]
.B \-R
@ -28,7 +28,7 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command
[[\-\-]
.IR args.\|.\|. ]
.LP
.B php
.B @program_prefix@php
[options] [\-B
.IR begin_code ]
.B \-F
@ -38,13 +38,13 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command
[[\-\-]
.IR args.\|.\|. ]
.LP
.B php
.B @program_prefix@php
[options] \-\- [
.IR args.\|.\|. ]
.LP
\fBphp \fP[options] \fB\-a\fP
\fB@program_prefix@php \fP[options] \fB\-a\fP
.LP
.B php
.B @program_prefix@php
[options] \-S
.IR addr:port
[\-t
@ -374,35 +374,35 @@ The standard configuration file will only be used when
cannot be found.
.SH EXAMPLES
.TP 5
\fIphp \-r 'echo "Hello World\\n";'\fP
\fI@program_prefix@php \-r 'echo "Hello World\\n";'\fP
This command simply writes the text "Hello World" to standard out.
.TP
\fIphp \-r 'print_r(gd_info());'\fP
\fI@program_prefix@php \-r 'print_r(gd_info());'\fP
This shows the configuration of your gd extension. You can use this
to easily check which image formats you can use. If you have any
dynamic modules you may want to use the same ini file that php uses
when executed from your webserver. There are more extensions which
have such a function. For dba use:
.RS
\fIphp \-r 'print_r(dba_handlers(1));'\fP
\fI@program_prefix@php \-r 'print_r(dba_handlers(1));'\fP
.RE
.TP
\fIphp \-R 'echo strip_tags($argn)."\\n";'\fP
\fI@program_prefix@php \-R 'echo strip_tags($argn)."\\n";'\fP
This PHP command strips off the HTML tags line by line and outputs the
result. To see how it works you can first look at the following PHP command
\'\fIphp \-d html_errors=1 \-i\fP\' which uses PHP to output HTML formatted
configuration information. If you then combine those two
\'\fIphp \.\.\.|php \.\.\.\fP\' you'll see what happens.
.TP
\fIphp \-E 'echo "Lines: $argi\\n";'\fP
\fI@program_prefix@php \-E 'echo "Lines: $argi\\n";'\fP
Using this PHP command you can count the lines being input.
.TP
\fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
\fI@program_prefix@php \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
In this example PHP expects each input line being a file. It counts all lines
of the files specified by each input line and shows the summarized result.
You may combine this with tools like find and change the php scriptlet.
.TP
\fIphp \-R 'echo "$argn\\n"; fgets(STDIN);'\fP
\fI@program_prefix@php \-R 'echo "$argn\\n"; fgets(STDIN);'\fP
Since you have access to STDIN from within \-B \-R \-F and \-E you can skip
certain input lines with your code. But note that in such cases $argi only
counts the lines being processed by php itself. Having read this you will

14
scripts/man1/php-config.1.in
View File

@ -1,12 +1,12 @@
.TH php\-config 1 "2010" "The PHP Group" "Scripting Language"
.TH @program_prefix@php\-config 1 "2014" "The PHP Group" "Scripting Language"
.SH NAME
php\-config \- get information about PHP configuration and compile options
@program_prefix@php\-config \- get information about PHP configuration and compile options
.SH SYNOPSIS
.B php\-config
.B @program_prefix@php\-config
[options]
.LP
.SH DESCRIPTION
.B php\-config
.B @program_prefix@php\-config
is a simple shell script for obtaining information about installed PHP configuration.
.SH OPTIONS
.TP 15
@ -57,15 +57,15 @@ PHP version
.PD 0
.B \-\-vernum
PHP version as integer
.TP
.RS
.PD 1
.P
.SH SEE ALSO
.BR php (1)
.BR @program_prefix@php (1)
.SH VERSION INFORMATION
This manpage describes \fBphp\fP, version @PHP_VERSION@.
.SH COPYRIGHT
Copyright \(co 1997\-2010 The PHP Group
Copyright \(co 1997\-2014 The PHP Group
.LP
This source file is subject to version 3.01 of the PHP license,
that is bundled with this package in the file LICENSE, and is

14
scripts/man1/phpize.1.in
View File

@ -1,12 +1,12 @@
.TH phpize 1 "2010" "The PHP Group" "Scripting Language"
.TH @program_prefix@phpize 1 "2014" "The PHP Group" "Scripting Language"
.SH NAME
phpize \- prepare a PHP extension for compiling
@program_prefix@phpize \- prepare a PHP extension for compiling
.SH SYNOPSIS
.B phpize
.B @program_prefix@phpize
[options]
.LP
.SH DESCRIPTION
.B phpize
.B @program_prefix@phpize
is a shell script to prepare PHP extension for compiling.
.SH OPTIONS
.TP 15
@ -24,15 +24,15 @@ Prints usage information
.PD 1
.B \-v
Prints API version information
.TP
.RS
.PD 1
.P
.SH SEE ALSO
.BR php (1)
.BR @program_prefix@php (1)
.SH VERSION INFORMATION
This manpage describes \fBphp\fP, version @PHP_VERSION@.
.SH COPYRIGHT
Copyright \(co 1997\-2010 The PHP Group
Copyright \(co 1997\-2014 The PHP Group
.LP
This source file is subject to version 3.01 of the PHP license,
that is bundled with this package in the file LICENSE, and is

4
win32/php_stdint.h
View File

@ -36,6 +36,10 @@
#ifndef _MSC_STDINT_H_ // [
#define _MSC_STDINT_H_
#ifndef _STDINT
# define _STDINT
#endif
#if _MSC_VER > 1000
#pragma once
#endif