[PHP-CVS] com php-src: Fixed bug #64720 (SegFault on zend_deactivate): NEWS Zend/tests/bug64720.phpt Zend/zend_object_handlers.c Zend/zend_opcode.c
Commit:77f15762137e2d8173df9b733b4cb70fc996
Author:Dmitry Stogov dmi...@zend.com Tue, 21 May 2013 09:58:11
+0400
Parents: 1124b0678f9e60384736c7c1a0d1e84c633a5e7a
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=77f15762137e2d8173df9b733b4cb70fc996
Log:
Fixed bug #64720 (SegFault on zend_deactivate)
Bugs:
https://bugs.php.net/64720
Changed paths:
M NEWS
A Zend/tests/bug64720.phpt
M Zend/zend_object_handlers.c
M Zend/zend_opcode.c
Diff:
diff --git a/NEWS b/NEWS
index 9910c7c..5bf6872 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP
NEWS
?? ??? 2013, PHP 5.4.16
- Core:
+ . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry)
. Fixed bug #64729 (compilation failure on x32). (Gustavo)
. Fixed bug #64660 (Segfault on memory exhaustion within function
definition).
(Stas, reported by Juha Kylmänen)
diff --git a/Zend/tests/bug64720.phpt b/Zend/tests/bug64720.phpt
new file mode 100644
index 000..6c33165
--- /dev/null
+++ b/Zend/tests/bug64720.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Bug #64720 (SegFault on zend_deactivate)
+--FILE--
+?php
+class Stat {
+private static $requests;
+public static function getInstance() {
+if (!isset(self::$requests[1])) {
+self::$requests[1] = new self();
+}
+return self::$requests[1];
+}
+
+public function __destruct() {
+unset(self::$requests[1]);
+}
+}
+
+class Foo {
+public function __construct() {
+Stat::getInstance();
+}
+}
+
+class Error {
+private $trace;
+public function __construct() {
+$this-trace = debug_backtrace(1);
+}
+}
+
+class Bar {
+public function __destruct() {
+Stat::getInstance();
+new Error();
+}
+
+public function test() {
+new Error();
+}
+}
+
+$foo = new Foo();
+$bar = new Bar();
+$bar-test();
+?
+--EXPECTF--
+Fatal error: Access to undeclared static property: Stat::$requests in
%sbug64720.php on line 12
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index cc45d35..c2bb056 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1278,6 +1278,14 @@ ZEND_API zval
**zend_std_get_static_property(zend_class_entry *ce, const char *p
}
}
+ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL) ||
+ UNEXPECTED(CE_STATIC_MEMBERS(ce)[property_info-offset] == NULL)) {
+ if (!silent) {
+ zend_error_noreturn(E_ERROR, Access to undeclared
static property: %s::$%s, ce-name, property_name);
+ }
+ return NULL;
+ }
+
return CE_STATIC_MEMBERS(ce)[property_info-offset];
}
/* }}} */
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index e673f01..695b651 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -162,8 +162,9 @@ static inline void cleanup_user_class_data(zend_class_entry
*ce TSRMLS_DC)
for (i = 0; i ce-default_static_members_count; i++) {
if (ce-static_members_table[i]) {
- zval_ptr_dtor(ce-static_members_table[i]);
+ zval *p = ce-static_members_table[i];
ce-static_members_table[i] = NULL;
+ zval_ptr_dtor(p);
}
}
ce-static_members_table = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS Zend/zend_object_handlers.c Zend/zend_opcode.c
Commit:a2d6d274584d5df2aa9c040396066d30ffd44d82 Author:Dmitry Stogov dmi...@zend.com Tue, 21 May 2013 10:15:37 +0400 Parents: 49c1a223d5ba14df3689de5bdb80f5031378a955 77f15762137e2d8173df9b733b4cb70fc996 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a2d6d274584d5df2aa9c040396066d30ffd44d82 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #64720 (SegFault on zend_deactivate) Conflicts: NEWS Bugs: https://bugs.php.net/64720 Changed paths: MM NEWS MM Zend/zend_object_handlers.c MM Zend/zend_opcode.c Diff: diff --cc NEWS index 7a19c7b,5bf6872..4e9ba71 --- a/NEWS +++ b/NEWS @@@ -1,12 -1,14 +1,13 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.4.16 +?? ??? 2013, PHP 5.5.0 Release Candidate 2 - Core: - . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry) - . Fixed bug #64729 (compilation failure on x32). (Gustavo) . Fixed bug #64660 (Segfault on memory exhaustion within function definition). (Stas, reported by Juha Kylmänen) - . Fixed bug #64853 (Use of no longer available ini directives causes crash on -TS build). (Anatol) ++ . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry) + . Fixed bug #64853 (Use of no longer available ini directives causes crash +on TS build). (Anatol) - Fileinfo: . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.: NEWS sap
Commit:0e99329e0aa8bbfe1b6d0ad06660630538118e2f
Author:Remi Collet r...@php.net Tue, 21 May 2013 09:49:00 +0200
Parents: 77f15762137e2d8173df9b733b4cb70fc996
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=0e99329e0aa8bbfe1b6d0ad06660630538118e2f
Log:
Add --with-fpm-systemd option to report health to systemd, and
systemd_interval option to configure this. The service can now use
Type=notify in the systemd unit file.
Systemd status line will looks like:
Status: Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic:
10req/sec
Watchdog mode is also supported. In this case watchdog interval,
configured in the unit file, override the systemd_interval option.
When not used (default), no change from previous version.
Changed paths:
M NEWS
M sapi/fpm/config.m4
M sapi/fpm/fpm/fpm_conf.c
M sapi/fpm/fpm/fpm_conf.h
M sapi/fpm/fpm/fpm_events.c
A sapi/fpm/fpm/fpm_systemd.c
A sapi/fpm/fpm/fpm_systemd.h
M sapi/fpm/php-fpm.conf.in
M sapi/fpm/php-fpm.service.in
diff --git a/NEWS b/NEWS
index 5bf6872..227fcac 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@ PHP
NEWS
. Fixed some possible memory or resource leaks and possible null dereference
detected by code coverity scan. (Remi)
. Log a warning when a syscall fails. (Remi)
+ . Add --with-fpm-systemd option to report health to systemd, and
+systemd_interval option to configure this. The service can now use
+Type=notify in the systemd unit file. (Remi)
- SNMP:
. Fixed bug #64765 (Some IPv6 addresses get interpreted wrong).
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 6191c32..579f7c2 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -563,6 +563,26 @@ if test $PHP_FPM != no; then
[ --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system
user, this
should usually be set to match the fpm username (default:
nobody)], nobody, no)
+ PHP_ARG_WITH(fpm-systemd,,
+ [ --with-fpm-systemd Activate systemd integration], no, no)
+
+ if test $PHP_FPM_SYSTEMD != no ; then
+AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS=-lsystemd-daemon)
+AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H=yes],
[HAVE_SD_DAEMON_H=no])
+if test $HAVE_SD_DAEMON_H = no || test -z ${SYSTEMD_LIBS}; then
+ AC_MSG_ERROR([Your system does not support systemd.])
+else
+ AC_DEFINE(HAVE_SYSTEMD, 1, [FPM use systemd integration])
+ PHP_FPM_SD_FILES=fpm/fpm_systemd.c
+ PHP_ADD_LIBRARY(systemd-daemon)
+ php_fpm_systemd=notify
+fi
+ else
+php_fpm_systemd=simple
+ fi
+ PHP_SUBST_OLD(php_fpm_systemd)
+ AC_DEFINE_UNQUOTED(PHP_FPM_SYSTEMD, $php_fpm_systemd, [fpm systemd service
type])
+
if test -z $PHP_FPM_USER -o $PHP_FPM_USER = yes -o $PHP_FPM_USER =
no; then
php_fpm_user=nobody
else
@@ -635,7 +655,7 @@ if test $PHP_FPM != no; then
fpm/events/port.c \
- PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES,
$PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
+ PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES
$PHP_FPM_SD_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
case $host_alias in
*aix*)
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 0a8a0e3..d85df18 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -45,6 +45,10 @@
#include fpm_log.h
#include fpm_events.h
#include zlog.h
+#ifdef HAVE_SYSTEMD
+#include fpm_systemd.h
+#endif
+
#define STR2STR(a) (a ? a : undefined)
#define BOOL2STR(a) (a ? yes : no)
@@ -73,6 +77,10 @@ struct fpm_global_config_s fpm_global_config = {
#endif
.process_max = 0,
.process_priority = 64, /* 64 means unset */
+#ifdef HAVE_SYSTEMD
+ .systemd_watchdog = 0,
+ .systemd_interval = -1, /* -1 means not set */
+#endif
};
static struct fpm_worker_pool_s *current_wp = NULL;
static int ini_recursion = 0;
@@ -100,6 +108,9 @@ static struct ini_value_parser_s ini_fpm_global_options[] =
{
{ rlimit_files,fpm_conf_set_integer,
GO(rlimit_files) },
{ rlimit_core, fpm_conf_set_rlimit_core,
GO(rlimit_core) },
{ events.mechanism,fpm_conf_set_string,
GO(events_mechanism) },
+#ifdef HAVE_SYSTEMD
+ { systemd_interval,fpm_conf_set_time,
GO(systemd_interval) },
+#endif
{ 0, 0, 0 }
};
@@ -1152,6 +1163,12 @@ static int fpm_conf_post_process(int force_daemon
TSRMLS_DC) /* {{{ */
fpm_global_config.error_log = strdup(log/php-fpm.log);
}
+#ifdef HAVE_SYSTEMD
+ if (0 fpm_systemd_conf()) {
+ return -1;
+ }
+#endif
+
#ifdef HAVE_SYSLOG_H
if (!fpm_global_config.syslog_ident) {
fpm_global_config.syslog_ident = strdup(php-fpm);
@@ -1540,6 +1557,9 @@ static
[PHP-CVS] com php-src: NEWS: NEWS
Commit:70abac2b4e6a76f1a32ff86a158b3a4f7f362e6f Author:Remi Collet r...@php.net Tue, 21 May 2013 09:54:39 +0200 Parents: c79f162c3724fdf935256f7020523cbb54db0795 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=70abac2b4e6a76f1a32ff86a158b3a4f7f362e6f Log: NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 4e9ba71..17e720a 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,11 @@ PHP NEWS - Fileinfo: . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol) +- FPM: + . Add --with-fpm-systemd option to report health to systemd, and +systemd_interval option to configure this. The service can now use +Type=notify in the systemd unit file. (Remi) + - mbstring: . Fixed bug #64769 (mbstring PHPTs crash on Windows x64). (Anatol) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: sapi/fpm/config.m4
Commit:c79f162c3724fdf935256f7020523cbb54db0795 Author:Remi Collet r...@php.net Tue, 21 May 2013 09:53:51 +0200 Parents: a2d6d274584d5df2aa9c040396066d30ffd44d82 0e99329e0aa8bbfe1b6d0ad06660630538118e2f Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c79f162c3724fdf935256f7020523cbb54db0795 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file. Changed paths: MM sapi/fpm/config.m4 Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: UPGRADING: UPGRADING
Commit:ed9a9b6144d9b2acaa621a5f51ffcf35850c8f36 Author:Remi Collet r...@php.net Tue, 21 May 2013 12:32:11 +0200 Parents: 70abac2b4e6a76f1a32ff86a158b3a4f7f362e6f Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed9a9b6144d9b2acaa621a5f51ffcf35850c8f36 Log: UPGRADING Changed paths: M UPGRADING Diff: diff --git a/UPGRADING b/UPGRADING index 008f8ee..6c6368b 100755 --- a/UPGRADING +++ b/UPGRADING @@ -58,6 +58,10 @@ PHP 5.5 UPGRADE NOTES - Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur) (https://wiki.php.net/rfc/cli_process_title) +- Support for systemd in php-fpm: + Add --with-fpm-systemd option to report health to systemd, and + systemd_interval option to configure this. The service can now use + Type=notify in the systemd unit file. (Remi) 3. Deprecated Functionality -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: updates: EXTENSIONS ext/mysql/CREDITS ext/mysqlnd/CREDITS
Commit:378a5f9bfe03ca7251af5dd6cd9c3be1a6524b34 Author:Andrey Hristov and...@php.net Tue, 21 May 2013 13:27:45 +0200 Parents: ed9a9b6144d9b2acaa621a5f51ffcf35850c8f36 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=378a5f9bfe03ca7251af5dd6cd9c3be1a6524b34 Log: updates Changed paths: M EXTENSIONS M ext/mysql/CREDITS M ext/mysqlnd/CREDITS Diff: diff --git a/EXTENSIONS b/EXTENSIONS index 5308582..61a1688 100644 --- a/EXTENSIONS +++ b/EXTENSIONS @@ -147,7 +147,7 @@ STATUS: Working COMMENT: Tested on phpts and isapi versions --- EXTENSION: mysql -PRIMARY MAINTAINER: Zak Greant z...@mysql.com, Georg Richter ge...@php.net, Johannes Schl�ter johan...@php.net, Ulf Wendel u...@php.net +PRIMARY MAINTAINER: Zak Greant z...@mysql.com, Georg Richter ge...@php.net, Andrey Hristov and...@php.net, Johannes Schl�ter johan...@php.net, Ulf Wendel u...@php.net MAINTENANCE: Maintained STATUS: Working --- @@ -158,7 +158,7 @@ STATUS: Working SINCE: 5.0 --- EXTENSION: mysqlnd -PRIMARY MAINTAINER: Georg Richter ge...@php.net, Andrey Hristov and...@php.net, Johannes Schl�ter johan...@php.net, Ulf Wendel u...@php.net +PRIMARY MAINTAINER: Andrey Hristov and...@php.net, Johannes Schl�ter johan...@php.net, Ulf Wendel u...@php.net MAINTENANCE: Maintained STATUS: Working SINCE: 5.3 diff --git a/ext/mysql/CREDITS b/ext/mysql/CREDITS index e5a6208..15b00a9 100644 --- a/ext/mysql/CREDITS +++ b/ext/mysql/CREDITS @@ -1,2 +1,2 @@ MySQL -Zeev Suraski, Zak Greant, Georg Richter +Zeev Suraski, Zak Greant, Georg Richter, Andrey Hristov diff --git a/ext/mysqlnd/CREDITS b/ext/mysqlnd/CREDITS index 5aed316..5a7d69d 100644 --- a/ext/mysqlnd/CREDITS +++ b/ext/mysqlnd/CREDITS @@ -1,2 +1,2 @@ MySQLnd -Andrey Hristov, Ulf Wendel, Georg Richter +Andrey Hristov, Ulf Wendel, Georg Richter, Johannes Schl�ter -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/calendar/jewish.c
Commit:4840ff0f05876ee614d17804d2340f2233eb4111 Author:Remi Collet r...@php.net Tue, 21 May 2013 18:09:02 +0200 Parents: 378a5f9bfe03ca7251af5dd6cd9c3be1a6524b34 646ebc2cb9148404ffbccf14413b794f3a1e0688 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4840ff0f05876ee614d17804d2340f2233eb4111 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int):metonicCycle = (inputDay + 310) / 6940; Changed paths: MM ext/calendar/jewish.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int): metonicCycle = (inputDay + 310) / 6940;: ext/calendar/jewish.c ext/cale
Commit:4828f7343b3f31d914f4d4a5545865b8a19f7fb6
Author:Remi Collet r...@php.net Tue, 21 May 2013 18:04:17 +0200
Parents: 46b05bc57aee7a24f87a31a079f9076f4870b780
Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=4828f7343b3f31d914f4d4a5545865b8a19f7fb6
Log:
Integer overflow in SndToJewish leads to php hang
AT least in (inputDay is long, metonicCycle is int):
metonicCycle = (inputDay + 310) / 6940;
So large value give strange (negative) results or php hangs.
This is patch already applied in some linux distro.
Changed paths:
M ext/calendar/jewish.c
A ext/calendar/tests/jdtojewish64.phpt
Diff:
diff --git a/ext/calendar/jewish.c b/ext/calendar/jewish.c
index f4dc7c3..1e7a06c 100644
--- a/ext/calendar/jewish.c
+++ b/ext/calendar/jewish.c
@@ -272,6 +272,7 @@
#define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7))
#define JEWISH_SDN_OFFSET 347997
+#define JEWISH_SDN_MAX 38245310 /* year 103759, 10 A.D. */
#define NEW_MOON_OF_CREATION 31524
#define SUNDAY0
@@ -519,7 +520,7 @@ void SdnToJewish(
int tishri1After;
int yearLength;
- if (sdn = JEWISH_SDN_OFFSET) {
+ if (sdn = JEWISH_SDN_OFFSET || sdn JEWISH_SDN_MAX) {
*pYear = 0;
*pMonth = 0;
*pDay = 0;
diff --git a/ext/calendar/tests/jdtojewish64.phpt
b/ext/calendar/tests/jdtojewish64.phpt
new file mode 100644
index 000..50f7f33
--- /dev/null
+++ b/ext/calendar/tests/jdtojewish64.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Integer overflow in SndToJewish leads to php hang
+--SKIPIF--
+?php
+include 'skipif.inc';
+if (PHP_INT_SIZE == 4) {
+die(skip this test is for 64bit platform only);
+}
+?
+--FILE--
+?php
+$a = array(38245310, 38245311, 9223372036854743639);
+
+foreach ($a as $x) var_dump(jdtojewish($x));
+--EXPECTF--
+string(11) 2/22/103759
+string(5) 0/0/0
+string(5) 0/0/0
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Don't double-quote name of namespaced function.: Zend/zend_API.h
Commit:2d5695cbc5a627cb278b3ab0b1f5eed2f8be1bee
Author:Sara Golemon poll...@php.net Sun, 19 May 2013 13:32:17
-0700
Parents: 4828f7343b3f31d914f4d4a5545865b8a19f7fb6
Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=2d5695cbc5a627cb278b3ab0b1f5eed2f8be1bee
Log:
Don't double-quote name of namespaced function.
ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)
was resulting in a function declaration of:
ns\zend_name()
including the errant quotes.
This diff corrects that. There are currently no uses of ZEND_NS_NAMED_FE
in core and reason to believe that there are no uses in the wild either.
Changed paths:
M Zend/zend_API.h
Diff:
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index f6f2c46..304715d 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -90,7 +90,7 @@ typedef struct _zend_fcall_info_cache {
#define ZEND_NS_RAW_FENTRY(ns, zend_name, name, arg_info, flags)
ZEND_RAW_FENTRY(ZEND_NS_NAME(ns, zend_name), name, arg_info, flags)
#define ZEND_NS_RAW_NAMED_FE(ns, zend_name, name, arg_info)
ZEND_NS_RAW_FENTRY(ns, #zend_name, name, arg_info, 0)
-#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)
ZEND_NS_FENTRY(ns, #zend_name, name, arg_info, 0)
+#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)
ZEND_NS_FENTRY(ns, zend_name, name, arg_info, 0)
#define ZEND_NS_FE(ns, name, arg_info)
ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, 0)
#define ZEND_NS_DEP_FE(ns, name, arg_info)
ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED)
#define ZEND_NS_FALIAS(ns, name, alias, arg_info)
ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_API.h
Commit:2d7415a4af66e0771b36a10534e304fe7af4a855 Author:Sara Golemon poll...@php.net Sun, 19 May 2013 13:34:57 -0700 Parents: 646ebc2cb9148404ffbccf14413b794f3a1e0688 2d5695cbc5a627cb278b3ab0b1f5eed2f8be1bee Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d7415a4af66e0771b36a10534e304fe7af4a855 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Don't double-quote name of namespaced function. Changed paths: MM Zend/zend_API.h Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_API.h
Commit:4f46a40b9df80ef3faf498262c7a06a77ee98041 Author:Sara Golemon poll...@php.net Sun, 19 May 2013 13:35:03 -0700 Parents: 4840ff0f05876ee614d17804d2340f2233eb4111 2d7415a4af66e0771b36a10534e304fe7af4a855 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4f46a40b9df80ef3faf498262c7a06a77ee98041 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Don't double-quote name of namespaced function. Changed paths: MM Zend/zend_API.h Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
