[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Jul 1 01:31:50 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3093r2=1.3094diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3093 php-src/ChangeLog:1.3094 --- php-src/ChangeLog:1.3093Mon Jun 30 01:31:47 2008 +++ php-src/ChangeLog Tue Jul 1 01:31:49 2008 @@ -1,3 +1,70 @@ +2008-06-30 Stanislav Malyshev [EMAIL PROTECTED] + +* ZendEngine2/zend_builtin_functions.c: + convert all built-in functions to new API + +2008-06-30 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ext/pcre/php_pcre.c + ext/pcre/tests/preg_replace_callback3.phpt + ext/pcre/tests/preg_replace_callback_error.phpt + ext/pcre/tests/preg_replace_error.phpt: + - New parameter parsing API (to preg_replace*) + - Fixed related tests + +* ext/sysvmsg/sysvmsg.c: + - MFB: Added arginfo + +* (PHP_5_3) + ext/sysvmsg/sysvmsg.c: + - Added arginfo + +* ext/ldap/ldap.c + ext/pcre/php_pcre.c + ext/sysvmsg/sysvmsg.c + ext/xmlrpc/xmlrpc-epi-php.c: + - MFB: zend_arg_defs.c is unnecessary now + +* ext/pcntl/pcntl.c: + MFB: + - Added arginfo + - Removed #include zend_arg_defs.c + +* (PHP_5_3) + ext/pcntl/pcntl.c: + - Added arginfo + - Removed #include zend_arg_defs.c + +* (PHP_5_3) + ext/ldap/ldap.c + ext/pcre/php_pcre.c + ext/sysvmsg/sysvmsg.c + ext/xmlrpc/xmlrpc-epi-php.c: + - zend_arg_defs.c is unnecessary now + +2008-06-30 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/string.c: + l is long, that's why it is l, not i + +* (PHP_5_3) + ext/standard/string.c: + int - long + +2008-06-30 Felipe Pena [EMAIL PROTECTED] + +* ext/pgsql/pgsql.c + ext/pgsql/tests/08escape.phpt + ext/pgsql/tests/98old_api.phpt: + - MFB: New parameter parsing API + - Fixed tests + +* (PHP_5_3) + ext/pgsql/tests/98old_api.phpt: + - Fixed test + 2008-06-29 Felipe Pena [EMAIL PROTECTED] * ext/mssql/php_mssql.c:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Jul 1 01:31:53 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1327r2=1.1328diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1327 ZendEngine2/ChangeLog:1.1328 --- ZendEngine2/ChangeLog:1.1327Mon Jun 30 01:31:52 2008 +++ ZendEngine2/ChangeLog Tue Jul 1 01:31:52 2008 @@ -1,3 +1,8 @@ +2008-06-30 Stanislav Malyshev [EMAIL PROTECTED] + +* zend_builtin_functions.c: + convert all built-in functions to new API + 2008-06-29 Rui Hirokawa [EMAIL PROTECTED] * (PHP_5_3) @@ -24374,7 +24379,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1327 2008/06/30 01:31:52 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1328 2008/07/01 01:31:52 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -26098,7 +26103,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1327 2008/06/30 01:31:52 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1328 2008/07/01 01:31:52 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
tony2001Mon Jun 30 10:10:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
Log:
int - long
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.25r2=1.445.2.14.2.69.2.26diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.25
php-src/ext/standard/string.c:1.445.2.14.2.69.2.26
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.25 Wed Jun 25 12:16:16 2008
+++ php-src/ext/standard/string.c Mon Jun 30 10:10:44 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.25 2008/06/25 12:16:16 ohill Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.26 2008/06/30 10:10:44 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -998,7 +998,7 @@
PHP_FUNCTION(explode)
{
zval **str, **delim, **zlimit = NULL;
- int limit = -1;
+ long limit = -1;
int argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ZZ|l, delim,
str, limit) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
On 30.06.2008 14:39, Antony Dovgal wrote: tony2001Mon Jun 30 10:39:35 2008 UTC Added files: (Branch: PHP_5_3) /pecl/sdo/SCA/Bindings/atom Atom1.0.xsd xhtml1-strict.xsd ServiceRequestHandler.php Proxy.php .cvsignore xml.xsd AtomDas.php RequestTester.php SCA_AtomServer.php SCA_ServiceWrapperAtom.php Atom1.0.xsd ServiceRequestHandler.php SCA_AtomServer.php SCA_ServiceWrapperAtom.php AtomDas.php RequestTester.php .cvsignore xml.xsd xhtml1-strict.xsd Proxy.php WTH?! Since when cvs ci ext/standard/string.c modifies something else than ext/standard/string.c ? Here is full error log I received: --- COMMITINFO /repository/php-src/ext/standard string.c Checking in ext/standard/string.c; /repository/php-src/ext/standard/string.c,v -- string.c new revision: 1.445.2.14.2.69.2.27; previous revision: 1.445.2.14.2.69.2.26 done 42862 LOGINFO php-cvs@lists.php.net tony2001 php-src/ext/standard string.c,1.445.2.14.2.69.2.26,1.445.2.14.2.69.2.27 Use of uninitialized value in string eq at /repository/CVSROOT/loginfo.pl line 127, FC line 11. Use of uninitialized value in string eq at /repository/CVSROOT/loginfo.pl line 127, FC line 11. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 152. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 152. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 153. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 153. cvs rdiff: cannot find module `pecl/sdo/SCA/Bindings/atom/binding' - ignored 42863 Mailing the commit email to php-cvs@lists.php.net -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ldap ldap.c /ext/pcre php_pcre.c /ext/sysvmsg sysvmsg.c /ext/xmlrpc xmlrpc-epi-php.c
felipe Mon Jun 30 12:15:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ldap ldap.c
/php-src/ext/pcre php_pcre.c
/php-src/ext/sysvmsgsysvmsg.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
- zend_arg_defs.c is unnecessary now
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.14r2=1.161.2.3.2.11.2.15diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.14
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.15
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.14 Sun Jun 29 14:29:09 2008
+++ php-src/ext/ldap/ldap.c Mon Jun 30 12:15:52 2008
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.11.2.14 2008/06/29 14:29:09 felipe Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.15 2008/06/30 12:15:52 felipe Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -86,9 +86,6 @@
#ifdef COMPILE_DL_LDAP
ZEND_GET_MODULE(ldap)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
#endif
static void _close_ldap_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
@@ -227,7 +224,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v
1.161.2.3.2.11.2.14 2008/06/29 14:29:09 felipe Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v
1.161.2.3.2.11.2.15 2008/06/30 12:15:52 felipe Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.15r2=1.168.2.9.2.21.2.16diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.15
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.16
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.15 Sun Jun 1 18:47:20 2008
+++ php-src/ext/pcre/php_pcre.c Mon Jun 30 12:15:53 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.15 2008/06/01 18:47:20 bjori Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.16 2008/06/30 12:15:53 felipe Exp $ */
#include php.h
#include php_ini.h
@@ -1898,9 +1898,6 @@
#ifdef COMPILE_DL_PCRE
ZEND_GET_MODULE(pcre)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
#endif
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.20.2.3.2.6.2.3r2=1.20.2.3.2.6.2.4diff_format=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.3
php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.4
--- php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.3 Mon Dec 31 07:17:16 2007
+++ php-src/ext/sysvmsg/sysvmsg.c Mon Jun 30 12:15:53 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sysvmsg.c,v 1.20.2.3.2.6.2.3 2007/12/31 07:17:16 sebastian Exp $ */
+/* $Id: sysvmsg.c,v 1.20.2.3.2.6.2.4 2008/06/30 12:15:53 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -95,9 +95,6 @@
#ifdef COMPILE_DL_SYSVMSG
ZEND_GET_MODULE(sysvmsg)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
#endif
static void sysvmsg_release(zend_rsrc_list_entry *rsrc TSRMLS_DC)
@@ -126,7 +123,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, sysvmsg support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.20.2.3.2.6.2.3
$);
+ php_info_print_table_row(2, Revision, $Revision: 1.20.2.3.2.6.2.4
$);
php_info_print_table_end();
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.6.2.7r2=1.39.2.5.2.6.2.8diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.7
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.8
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.7Sat Jun 28
22:05:59 2008
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Mon Jun 30 12:15:53 2008
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.7 2008/06/28 22:05:59 felipe Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.8 2008/06/30 12:15:53 felipe Exp $ */
/**
* BUGS: *
@@ -187,9 +187,6 @@
#ifdef COMPILE_DL_XMLRPC
ZEND_GET_MODULE(xmlrpc)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
#endif
/***
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcntl pcntl.c
felipe Mon Jun 30 13:27:45 2008 UTC
Modified files:
/php-src/ext/pcntl pcntl.c
Log:
MFB:
- Added arginfo
- Removed #include zend_arg_defs.c
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.61r2=1.62diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.61 php-src/ext/pcntl/pcntl.c:1.62
--- php-src/ext/pcntl/pcntl.c:1.61 Sun Jun 22 15:44:19 2008
+++ php-src/ext/pcntl/pcntl.c Mon Jun 30 13:27:45 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pcntl.c,v 1.61 2008/06/22 15:44:19 indeyets Exp $ */
+/* $Id: pcntl.c,v 1.62 2008/06/30 13:27:45 felipe Exp $ */
#define PCNTL_DEBUG 0
@@ -44,24 +44,109 @@
ZEND_DECLARE_MODULE_GLOBALS(pcntl)
static PHP_GINIT_FUNCTION(pcntl);
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_pcntl_void, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_waitpid, 0, 0, 2)
+ ZEND_ARG_INFO(0, pid)
+ ZEND_ARG_INFO(1, status)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wait, 0, 0, 1)
+ ZEND_ARG_INFO(1, status)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_signal, 0, 0, 2)
+ ZEND_ARG_INFO(0, signo)
+ ZEND_ARG_INFO(0, handler)
+ ZEND_ARG_INFO(0, restart_syscalls)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifexited, 0, 0, 1)
+ ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifstopped, 0, 0, 1)
+ ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifsignaled, 0, 0, 1)
+ ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifexitstatus, 0, 0, 1)
+ ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wtermsig, 0, 0, 1)
+ ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wstopsig, 0, 0, 1)
+ ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_exec, 0, 0, 1)
+ ZEND_ARG_INFO(0, path)
+ ZEND_ARG_INFO(0, args)
+ ZEND_ARG_INFO(0, envs)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_alarm, 0, 0, 1)
+ ZEND_ARG_INFO(0, seconds)
+ZEND_END_ARG_INFO()
+
+#ifdef HAVE_GETPRIORITY
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_getpriority, 0, 0, 0)
+ ZEND_ARG_INFO(0, pid)
+ ZEND_ARG_INFO(0, process_identifier)
+ZEND_END_ARG_INFO()
+#endif
+
+#ifdef HAVE_SETPRIORITY
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_setpriority, 0, 0, 1)
+ ZEND_ARG_INFO(0, priority)
+ ZEND_ARG_INFO(0, pid)
+ ZEND_ARG_INFO(0, process_identifier)
+ZEND_END_ARG_INFO()
+#endif
+/* }}} */
+
const zend_function_entry pcntl_functions[] = {
- PHP_FE(pcntl_fork, NULL)
- PHP_FE(pcntl_waitpid, second_arg_force_ref)
- PHP_FE(pcntl_wait, first_arg_force_ref)
- PHP_FE(pcntl_signal,NULL)
- PHP_FE(pcntl_wifexited, NULL)
- PHP_FE(pcntl_wifstopped,NULL)
- PHP_FE(pcntl_wifsignaled, NULL)
- PHP_FE(pcntl_wexitstatus, NULL)
- PHP_FE(pcntl_wtermsig, NULL)
- PHP_FE(pcntl_wstopsig, NULL)
- PHP_FE(pcntl_exec, NULL)
- PHP_FE(pcntl_alarm, NULL)
+ PHP_FE(pcntl_fork, arginfo_pcntl_void)
+ PHP_FE(pcntl_waitpid, arginfo_pcntl_waitpid)
+ PHP_FE(pcntl_wait, arginfo_pcntl_wait)
+ PHP_FE(pcntl_signal,arginfo_pcntl_signal)
+ PHP_FE(pcntl_wifexited, arginfo_pcntl_wifexited)
+ PHP_FE(pcntl_wifstopped,arginfo_pcntl_wifstopped)
+ PHP_FE(pcntl_wifsignaled, arginfo_pcntl_wifsignaled)
+ PHP_FE(pcntl_wexitstatus, arginfo_pcntl_wifexitstatus)
+ PHP_FE(pcntl_wtermsig, arginfo_pcntl_wtermsig)
+ PHP_FE(pcntl_wstopsig, arginfo_pcntl_wstopsig)
+ PHP_FE(pcntl_exec, arginfo_pcntl_exec)
+ PHP_FE(pcntl_alarm, arginfo_pcntl_alarm)
#ifdef HAVE_GETPRIORITY
- PHP_FE(pcntl_getpriority, NULL)
+ PHP_FE(pcntl_getpriority, arginfo_pcntl_getpriority)
#endif
#ifdef HAVE_SETPRIORITY
- PHP_FE(pcntl_setpriority, NULL)
+ PHP_FE(pcntl_setpriority, arginfo_pcntl_setpriority)
#endif
{NULL, NULL, NULL}
};
@@ -85,9 +170,6 @@
#ifdef COMPILE_DL_PCNTL
ZEND_GET_MODULE(pcntl)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
#endif
static void pcntl_signal_handler(int);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap ldap.c /ext/pcre php_pcre.c /ext/sysvmsg sysvmsg.c /ext/xmlrpc xmlrpc-epi-php.c
felipe Mon Jun 30 13:47:22 2008 UTC
Modified files:
/php-src/ext/ldap ldap.c
/php-src/ext/pcre php_pcre.c
/php-src/ext/sysvmsgsysvmsg.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
- MFB: zend_arg_defs.c is unnecessary now
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.185r2=1.186diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.185 php-src/ext/ldap/ldap.c:1.186
--- php-src/ext/ldap/ldap.c:1.185 Sun Jun 29 14:34:39 2008
+++ php-src/ext/ldap/ldap.c Mon Jun 30 13:47:22 2008
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.185 2008/06/29 14:34:39 felipe Exp $ */
+/* $Id: ldap.c,v 1.186 2008/06/30 13:47:22 felipe Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -86,9 +86,6 @@
#ifdef COMPILE_DL_LDAP
ZEND_GET_MODULE(ldap)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
#endif
static void _close_ldap_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
@@ -227,7 +224,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.185
2008/06/29 14:34:39 felipe Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.186
2008/06/30 13:47:22 felipe Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.234r2=1.235diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.234 php-src/ext/pcre/php_pcre.c:1.235
--- php-src/ext/pcre/php_pcre.c:1.234 Sun Jun 1 18:50:00 2008
+++ php-src/ext/pcre/php_pcre.c Mon Jun 30 13:47:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.234 2008/06/01 18:50:00 bjori Exp $ */
+/* $Id: php_pcre.c,v 1.235 2008/06/30 13:47:22 felipe Exp $ */
/* TODO
* php_pcre_replace_impl():
@@ -2142,9 +2142,6 @@
#ifdef COMPILE_DL_PCRE
ZEND_GET_MODULE(pcre)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
#endif
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.35 php-src/ext/sysvmsg/sysvmsg.c:1.36
--- php-src/ext/sysvmsg/sysvmsg.c:1.35 Wed May 21 12:01:55 2008
+++ php-src/ext/sysvmsg/sysvmsg.c Mon Jun 30 13:47:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sysvmsg.c,v 1.35 2008/05/21 12:01:55 tony2001 Exp $ */
+/* $Id: sysvmsg.c,v 1.36 2008/06/30 13:47:22 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -96,9 +96,6 @@
#ifdef COMPILE_DL_SYSVMSG
ZEND_GET_MODULE(sysvmsg)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
#endif
/* {{{ PHP_INI
@@ -137,7 +134,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, sysvmsg support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.35 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.36 $);
php_info_print_table_end();
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.56r2=1.57diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.56
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.57
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.56Sat Jun 28 22:19:24 2008
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Mon Jun 30 13:47:22 2008
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.56 2008/06/28 22:19:24 felipe Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.57 2008/06/30 13:47:22 felipe Exp $ */
/**
* BUGS: *
@@ -187,9 +187,6 @@
#ifdef COMPILE_DL_XMLRPC
ZEND_GET_MODULE(xmlrpc)
-# ifdef PHP_WIN32
-# include zend_arg_defs.c
-# endif
#endif
/***
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sysvmsg sysvmsg.c
felipe Mon Jun 30 14:53:18 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sysvmsgsysvmsg.c
Log:
- Added arginfo
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.20.2.3.2.6.2.4r2=1.20.2.3.2.6.2.5diff_format=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.4
php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.5
--- php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.4 Mon Jun 30 12:15:53 2008
+++ php-src/ext/sysvmsg/sysvmsg.c Mon Jun 30 14:53:17 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sysvmsg.c,v 1.20.2.3.2.6.2.4 2008/06/30 12:15:53 felipe Exp $ */
+/* $Id: sysvmsg.c,v 1.20.2.3.2.6.2.5 2008/06/30 14:53:17 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -39,40 +39,69 @@
/* True global resources - no need for thread safety here */
static int le_sysvmsg;
+/* {{{ arginfo */
static
- ZEND_BEGIN_ARG_INFO(sixth_arg_force_ref, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_get_queue, 0, 0, 1)
+ ZEND_ARG_INFO(0, key)
+ ZEND_ARG_INFO(0, perms)
+ZEND_END_ARG_INFO()
static
- ZEND_BEGIN_ARG_INFO(msg_receive_args_force_ref, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_send, 0, 0, 3)
+ ZEND_ARG_INFO(0, queue)
+ ZEND_ARG_INFO(0, msgtype)
+ ZEND_ARG_INFO(0, message)
+ ZEND_ARG_INFO(0, serialize)
+ ZEND_ARG_INFO(0, blocking)
+ ZEND_ARG_INFO(1, errorcode)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_receive, 0, 0, 5)
+ ZEND_ARG_INFO(0, queue)
+ ZEND_ARG_INFO(0, desiredmsgtype)
+ ZEND_ARG_INFO(1, msgtype)
+ ZEND_ARG_INFO(0, maxsize)
+ ZEND_ARG_INFO(1, message)
+ ZEND_ARG_INFO(0, unserialize)
+ ZEND_ARG_INFO(0, flags)
+ ZEND_ARG_INFO(1, errorcode)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_remove_queue, 0, 0, 1)
+ ZEND_ARG_INFO(0, queue)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_stat_queue, 0, 0, 1)
+ ZEND_ARG_INFO(0, queue)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_set_queue, 0, 0, 2)
+ ZEND_ARG_INFO(0, queue)
+ ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_queue_exists, 0, 0, 1)
+ ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO()
+/* }}} */
/* {{{ sysvmsg_functions[]
*
* Every user visible function must have an entry in sysvmsg_functions[].
*/
const zend_function_entry sysvmsg_functions[] = {
- PHP_FE(msg_get_queue, NULL)
- PHP_FE(msg_send,
sixth_arg_force_ref)
- PHP_FE(msg_receive,
msg_receive_args_force_ref)
- PHP_FE(msg_remove_queue,NULL)
- PHP_FE(msg_stat_queue, NULL)
- PHP_FE(msg_set_queue, NULL)
- PHP_FE(msg_queue_exists,NULL)
+ PHP_FE(msg_get_queue, arginfo_msg_get_queue)
+ PHP_FE(msg_send,
arginfo_msg_send)
+ PHP_FE(msg_receive,
arginfo_msg_receive)
+ PHP_FE(msg_remove_queue,
arginfo_msg_remove_queue)
+ PHP_FE(msg_stat_queue, arginfo_msg_stat_queue)
+ PHP_FE(msg_set_queue, arginfo_msg_set_queue)
+ PHP_FE(msg_queue_exists,
arginfo_msg_queue_exists)
{NULL, NULL, NULL} /* Must be the last line in sysvmsg_functions[]
*/
};
/* }}} */
@@ -123,7 +152,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, sysvmsg support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.20.2.3.2.6.2.4
$);
+ php_info_print_table_row(2, Revision, $Revision: 1.20.2.3.2.6.2.5
$);
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sysvmsg sysvmsg.c
felipe Mon Jun 30 14:53:45 2008 UTC
Modified files:
/php-src/ext/sysvmsgsysvmsg.c
Log:
- MFB: Added arginfo
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.36 php-src/ext/sysvmsg/sysvmsg.c:1.37
--- php-src/ext/sysvmsg/sysvmsg.c:1.36 Mon Jun 30 13:47:22 2008
+++ php-src/ext/sysvmsg/sysvmsg.c Mon Jun 30 14:53:45 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sysvmsg.c,v 1.36 2008/06/30 13:47:22 felipe Exp $ */
+/* $Id: sysvmsg.c,v 1.37 2008/06/30 14:53:45 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -40,40 +40,69 @@
/* True global resources - no need for thread safety here */
static int le_sysvmsg;
+/* {{{ arginfo */
static
- ZEND_BEGIN_ARG_INFO(sixth_arg_force_ref, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_get_queue, 0, 0, 1)
+ ZEND_ARG_INFO(0, key)
+ ZEND_ARG_INFO(0, perms)
+ZEND_END_ARG_INFO()
static
- ZEND_BEGIN_ARG_INFO(msg_receive_args_force_ref, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_send, 0, 0, 3)
+ ZEND_ARG_INFO(0, queue)
+ ZEND_ARG_INFO(0, msgtype)
+ ZEND_ARG_INFO(0, message)
+ ZEND_ARG_INFO(0, serialize)
+ ZEND_ARG_INFO(0, blocking)
+ ZEND_ARG_INFO(1, errorcode)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_receive, 0, 0, 5)
+ ZEND_ARG_INFO(0, queue)
+ ZEND_ARG_INFO(0, desiredmsgtype)
+ ZEND_ARG_INFO(1, msgtype)
+ ZEND_ARG_INFO(0, maxsize)
+ ZEND_ARG_INFO(1, message)
+ ZEND_ARG_INFO(0, unserialize)
+ ZEND_ARG_INFO(0, flags)
+ ZEND_ARG_INFO(1, errorcode)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_remove_queue, 0, 0, 1)
+ ZEND_ARG_INFO(0, queue)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_stat_queue, 0, 0, 1)
+ ZEND_ARG_INFO(0, queue)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_set_queue, 0, 0, 2)
+ ZEND_ARG_INFO(0, queue)
+ ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_queue_exists, 0, 0, 1)
+ ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO()
+/* }}} */
/* {{{ sysvmsg_functions[]
*
* Every user visible function must have an entry in sysvmsg_functions[].
*/
const zend_function_entry sysvmsg_functions[] = {
- PHP_FE(msg_get_queue, NULL)
- PHP_FE(msg_send,
sixth_arg_force_ref)
- PHP_FE(msg_receive,
msg_receive_args_force_ref)
- PHP_FE(msg_remove_queue,NULL)
- PHP_FE(msg_stat_queue, NULL)
- PHP_FE(msg_set_queue, NULL)
- PHP_FE(msg_queue_exists,NULL)
+ PHP_FE(msg_get_queue, arginfo_msg_get_queue)
+ PHP_FE(msg_send,
arginfo_msg_send)
+ PHP_FE(msg_receive,
arginfo_msg_receive)
+ PHP_FE(msg_remove_queue,
arginfo_msg_remove_queue)
+ PHP_FE(msg_stat_queue, arginfo_msg_stat_queue)
+ PHP_FE(msg_set_queue, arginfo_msg_set_queue)
+ PHP_FE(msg_queue_exists,
arginfo_msg_queue_exists)
{NULL, NULL, NULL} /* Must be the last line in sysvmsg_functions[]
*/
};
/* }}} */
@@ -134,7 +163,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, sysvmsg support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.36 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.37 $);
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Mon Jun 30 16:40:21 2008 UTC Modified files: /CVSROOTavail Log: - Karma for Michal Dziemianko (GSoC Student, requested by Scott). http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1416r2=1.1417diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1416 CVSROOT/avail:1.1417 --- CVSROOT/avail:1.1416Sun Jun 22 10:00:19 2008 +++ CVSROOT/avail Mon Jun 30 16:40:21 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb +avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb # Some people have access to tests in the Engine avail|magnus,michael,zoe,jmessa,sfox,tomerc|Zend/tests,ZendEngine2/tests -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcre php_pcre.c /ext/pcre/tests preg_replace_callback3.phpt preg_replace_callback_error.phpt preg_replace_error.phpt
felipe Mon Jun 30 17:14:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcre php_pcre.c
/php-src/ext/pcre/tests preg_replace_callback3.phpt
preg_replace_callback_error.phpt
preg_replace_error.phpt
Log:
- New parameter parsing API (to preg_replace*)
- Fixed related tests
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.16r2=1.168.2.9.2.21.2.17diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.16
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.17
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.16 Mon Jun 30 12:15:53 2008
+++ php-src/ext/pcre/php_pcre.c Mon Jun 30 17:14:48 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.16 2008/06/30 12:15:53 felipe Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.17 2008/06/30 17:14:48 felipe Exp $ */
#include php.h
#include php_ini.h
@@ -1289,12 +1289,12 @@
zval **regex,
**replace,
**subject,
- **limit,
**subject_entry,
**zcount;
char*result;
int result_len;
int limit_val = -1;
+ longlimit;
char*string_key;
ulongnum_key;
char*callback_name;
@@ -1302,10 +1302,10 @@
int *replace_count_ptr=NULL;
/* Get function parameters and do error-checking. */
- if (ZEND_NUM_ARGS() 3 || ZEND_NUM_ARGS() 5 ||
- zend_get_parameters_ex(ZEND_NUM_ARGS(), regex, replace,
subject, limit, zcount) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ZZZ|lZ, regex,
replace, subject, limit, zcount) == FAILURE) {
+ return;
}
+
if (!is_callable_replace Z_TYPE_PP(replace) == IS_ARRAY
Z_TYPE_PP(regex) != IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Parameter
mismatch, pattern is a string while replacement is an array);
RETURN_FALSE;
@@ -1330,8 +1330,7 @@
SEPARATE_ZVAL(subject);
if (ZEND_NUM_ARGS() 3) {
- convert_to_long_ex(limit);
- limit_val = Z_LVAL_PP(limit);
+ limit_val = limit;
}
if (ZEND_NUM_ARGS() 4) {
replace_count_ptr = replace_count;
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_callback3.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/ext/pcre/tests/preg_replace_callback3.phpt
diff -u php-src/ext/pcre/tests/preg_replace_callback3.phpt:1.1.2.2
php-src/ext/pcre/tests/preg_replace_callback3.phpt:1.1.2.2.2.1
--- php-src/ext/pcre/tests/preg_replace_callback3.phpt:1.1.2.2 Wed Aug 30
16:46:59 2006
+++ php-src/ext/pcre/tests/preg_replace_callback3.phpt Mon Jun 30 17:14:48 2008
@@ -18,13 +18,13 @@
echo Done\n;
?
--EXPECTF--
-Warning: Wrong parameter count for preg_replace_callback() in %s on line %d
+Warning: preg_replace_callback() expects at least 3 parameters, 0 given in %s
on line %d
NULL
-Warning: Wrong parameter count for preg_replace_callback() in %s on line %d
+Warning: preg_replace_callback() expects at least 3 parameters, 1 given in %s
on line %d
NULL
-Warning: Wrong parameter count for preg_replace_callback() in %s on line %d
+Warning: preg_replace_callback() expects at least 3 parameters, 2 given in %s
on line %d
NULL
Warning: preg_replace_callback(): Requires argument 2, '2', to be a valid
callback in %s on line %d
@@ -36,10 +36,9 @@
Warning: preg_replace_callback(): Requires argument 2, '2', to be a valid
callback in %s on line %d
int(3)
-Warning: preg_replace_callback(): Requires argument 2, '', to be a valid
callback in %s on line 1%d
-string(0)
+Warning: preg_replace_callback() expects parameter 4 to be long, string given
in %s on line %d
+NULL
-Warning: preg_replace_callback(): Requires argument 2, 'Array', to be a valid
callback in %s on line %d
-array(0) {
-}
+Warning: preg_replace_callback() expects parameter 4 to be long, array given
in %s on line %d
+NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_callback_error.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/pcre/tests/preg_replace_callback_error.phpt
diff -u php-src/ext/pcre/tests/preg_replace_callback_error.phpt:1.1.4.2
php-src/ext/pcre/tests/preg_replace_callback_error.phpt:1.1.4.3
--- php-src/ext/pcre/tests/preg_replace_callback_error.phpt:1.1.4.2 Wed Nov
21 18:22:01 2007
+++
