Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c com_persist.c /ext/ctype ctype.c /ext/curl interface.c
Johannes Schlüter wrote: Dmitry Stogov wrote: Yes, of course. I'll update it soon. I am going to backport several other patches nearest days, so I'm not sure if I should update version every day. It should be enough to change it once before an release. People running snapshots should expect stuff to break during development :-) Maybe another point to add to the release checklist? regards, Lukas -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard browscap.c
janiFri Sep 28 23:34:31 2007 UTC Modified files: /php-src/ext/standard browscap.c Log: - Fix copy and paste typo http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.95&r2=1.96&diff_format=u Index: php-src/ext/standard/browscap.c diff -u php-src/ext/standard/browscap.c:1.95 php-src/ext/standard/browscap.c:1.96 --- php-src/ext/standard/browscap.c:1.95Fri Sep 28 02:04:28 2007 +++ php-src/ext/standard/browscap.c Fri Sep 28 23:34:31 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: browscap.c,v 1.95 2007/09/28 02:04:28 jani Exp $ */ +/* $Id: browscap.c,v 1.96 2007/09/28 23:34:31 jani Exp $ */ #include "php.h" #include "php_browscap.h" @@ -29,7 +29,7 @@ static HashTable browser_hash; static zval *current_section; -static zval *current_section_name; +static char *current_section_name; #define DEFAULT_SECTION_NAME "Default Browser Capability Settings" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions phpinfo.phpt
nlopess Fri Sep 28 22:40:23 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions phpinfo.phpt Log: fix expected output http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.3 php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.4 --- php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.3 Fri Sep 14 15:36:29 2007 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Fri Sep 28 22:40:23 2007 @@ -31,7 +31,9 @@ Debug Build => %s Thread Safety => %s Zend Memory Manager => %s +Unicode Support => %s IPv6 Support => %s + Registered PHP Streams => %s Registered Stream Socket Transports => %s Registered Stream Filters => %s -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / README.PARAMETER_PARSING_API
johannesFri Sep 28 22:04:47 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcREADME.PARAMETER_PARSING_API
Log:
- MFH: Fix type in example
http://cvs.php.net/viewvc.cgi/php-src/README.PARAMETER_PARSING_API?r1=1.7.6.2&r2=1.7.6.3&diff_format=u
Index: php-src/README.PARAMETER_PARSING_API
diff -u php-src/README.PARAMETER_PARSING_API:1.7.6.2
php-src/README.PARAMETER_PARSING_API:1.7.6.3
--- php-src/README.PARAMETER_PARSING_API:1.7.6.2Mon Feb 5 17:57:51 2007
+++ php-src/README.PARAMETER_PARSING_APIFri Sep 28 22:04:47 2007
@@ -70,7 +70,7 @@
/* Gets an object of class specified by my_ce, and an optional double. */
zval *obj;
double d = 0.5;
-zend_class_entry my_ce;
+zend_class_entry *my_ce;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
&obj, my_ce, &d) == FAILURE) {
return;
--
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) / README.PARAMETER_PARSING_API
johannesFri Sep 28 22:04:40 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcREADME.PARAMETER_PARSING_API
Log:
- MFH: Fix type in example
http://cvs.php.net/viewvc.cgi/php-src/README.PARAMETER_PARSING_API?r1=1.7.6.2&r2=1.7.6.2.2.1&diff_format=u
Index: php-src/README.PARAMETER_PARSING_API
diff -u php-src/README.PARAMETER_PARSING_API:1.7.6.2
php-src/README.PARAMETER_PARSING_API:1.7.6.2.2.1
--- php-src/README.PARAMETER_PARSING_API:1.7.6.2Mon Feb 5 17:57:51 2007
+++ php-src/README.PARAMETER_PARSING_APIFri Sep 28 22:04:39 2007
@@ -70,7 +70,7 @@
/* Gets an object of class specified by my_ce, and an optional double. */
zval *obj;
double d = 0.5;
-zend_class_entry my_ce;
+zend_class_entry *my_ce;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
&obj, my_ce, &d) == FAILURE) {
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.PARAMETER_PARSING_API
johannesFri Sep 28 22:04:28 2007 UTC
Modified files:
/php-srcREADME.PARAMETER_PARSING_API
Log:
- Fix type in example
http://cvs.php.net/viewvc.cgi/php-src/README.PARAMETER_PARSING_API?r1=1.21&r2=1.22&diff_format=u
Index: php-src/README.PARAMETER_PARSING_API
diff -u php-src/README.PARAMETER_PARSING_API:1.21
php-src/README.PARAMETER_PARSING_API:1.22
--- php-src/README.PARAMETER_PARSING_API:1.21 Wed May 23 18:48:16 2007
+++ php-src/README.PARAMETER_PARSING_APIFri Sep 28 22:04:28 2007
@@ -93,7 +93,7 @@
/* Gets an object of class specified by my_ce, and an optional double. */
zval *obj;
double d = 0.5;
-zend_class_entry my_ce;
+zend_class_entry *my_ce;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
&obj, my_ce, &d) == FAILURE) {
return;
--
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) / README.namespaces /ext/tokenizer tokenizer_data.c
johannesFri Sep 28 21:02:19 2007 UTC
Added files: (Branch: PHP_5_3)
/php-srcREADME.namespaces
Modified files:
/php-src/ext/tokenizer tokenizer_data.c
Log:
- Merge minor namespace related stuff (README and tokenizer)
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer_data.c?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/tokenizer/tokenizer_data.c
diff -u php-src/ext/tokenizer/tokenizer_data.c:1.1.2.2
php-src/ext/tokenizer/tokenizer_data.c:1.1.2.2.2.1
--- php-src/ext/tokenizer/tokenizer_data.c:1.1.2.2 Tue Jul 31 23:24:11 2007
+++ php-src/ext/tokenizer/tokenizer_data.c Fri Sep 28 21:02:19 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tokenizer_data.c,v 1.1.2.2 2007/07/31 23:24:11 johannes Exp $ */
+/* $Id: tokenizer_data.c,v 1.1.2.2.2.1 2007/09/28 21:02:19 johannes Exp $ */
/*
DO NOT EDIT THIS FILE!
@@ -147,6 +147,9 @@
REGISTER_LONG_CONSTANT("T_DOLLAR_OPEN_CURLY_BRACES",
T_DOLLAR_OPEN_CURLY_BRACES, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("T_CURLY_OPEN", T_CURLY_OPEN, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("T_PAAMAYIM_NEKUDOTAYIM",
T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("T_NAMESPACE", T_NAMESPACE, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("T_IMPORT", T_IMPORT, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("T_NS_C", T_NS_C, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM,
CONST_CS | CONST_PERSISTENT);
}
@@ -272,6 +275,9 @@
case T_DOLLAR_OPEN_CURLY_BRACES: return
"T_DOLLAR_OPEN_CURLY_BRACES";
case T_CURLY_OPEN: return "T_CURLY_OPEN";
case T_PAAMAYIM_NEKUDOTAYIM: return "T_DOUBLE_COLON";
+ case T_NAMESPACE: return "T_NAMESPACE";
+ case T_IMPORT: return "T_IMPORT";
+ case T_NS_C: return "T_NS_C";
}
return "UNKNOWN";
http://cvs.php.net/viewvc.cgi/php-src/README.namespaces?view=markup&rev=1.1
Index: php-src/README.namespaces
+++ php-src/README.namespaces
Main assumption of the model is that the problem that we are to solve is the
problem of the very long class names in PHP libraries. We would not attempt
to take autoloader's job or create packaging model - only make names
manageable.
Namespaces are defined the following way:
Zend/DB/Connection.php:
Namespace definition does the following:
All class and function names inside are automatically prefixed with
namespace name. Inside namespace, local name always takes precedence over
global name. It is possible to use the same namespace in several PHP files.
The namespace declaration statement must be the very first statement in
file.
Every class and function from namespace can be referred to by the full name
- e.g. Zend::DB::Connection or Zend::DB::connect - at any time.
Namespace or class name can be imported:
import statement only defines name aliasing. It may create name alias for
namespace or class. The simple form of statement "import A::B::C::D;" is
equivalent to "import A::B::C::D as D;". Import statement can be used at any
time in global scope (not inside function/class) and takes effect from the
point of definition down to the end of file. It is recommended however to
place imports at the beginning of the file. Import statements have effect
only on file where they are written.
The special "empty" namespace (:: prefix) is useful as explicit global
namespace qualification. All class and function names started from ::
interpreted as global.
A special constant __NAMESPACE__ indicates the current namespace. It can be
used to construct fully-qualified names to pass them as callbacks.
In global namespace __NAMESPACE__ constant has value of empty string.
Names inside namespace are resolved according to the following rules.
1) all qualified names are translated during compilation according to
current import rules. So if we have "import A::B::C;" and then "C::D::e();"
it is translated to "A::B::C::D::e()"
2) unqualified class names translated during compilation according to
current import rules. So if we have "import A::B::C;" and then "new C();" it
is translated to "new A::B::C()"
3) calls to unqualified functions that are defined in current namespace
interpreted as calls to corresponding functions
4) calls to unqualified functions that are not defined in current namespace
are resolved in run-time. The call to function foo() inside namespace (A::B)
first tries to find and call function from current namespace A::B::foo() and
if it doesn't exist PHP tries to call internal function foo(). Note that
using foo() in namespace you can call only internal PHP functions, however
using ::foo() you are able to call any function from global namespace.
5) unqualified class
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c
dmitry Fri Sep 28 19:53:42 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c
Log:
Support for namespaces
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.2&r2=1.725.2.31.2.64.2.3&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.2
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.3
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.2 Fri Sep 28
02:05:08 2007
+++ php-src/ext/standard/basic_functions.c Fri Sep 28 19:53:42 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.2 2007/09/28 02:05:08 jani Exp $
*/
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.3 2007/09/28 19:53:42 dmitry Exp
$ */
#include "php.h"
#include "php_streams.h"
@@ -4256,7 +4256,7 @@
}
convert_to_string_ex(const_name);
- if (!zend_get_constant(Z_STRVAL_PP(const_name),
Z_STRLEN_PP(const_name), return_value TSRMLS_CC)) {
+ if (!zend_get_constant_ex(Z_STRVAL_PP(const_name),
Z_STRLEN_PP(const_name), return_value, NULL, 0 TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't find
constant %s", Z_STRVAL_PP(const_name));
RETURN_NULL();
}
--
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) / NEWS /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c com_persist.c /ext/ctype ctype.c /ext/curl interface.c
Dmitry Stogov wrote: > Yes, of course. I'll update it soon. > I am going to backport several other patches nearest days, so I'm not sure > if I should update version every day. It should be enough to change it once before an release. People running snapshots should expect stuff to break during development :-) johannes > Thanks. Dmitry. > >> -Original Message- >> From: Andrey Hristov [mailto:[EMAIL PROTECTED] >> Sent: Friday, September 28, 2007 7:18 PM >> To: Dmitry Stogov >> Cc: php-cvs@lists.php.net >> Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS >> /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c >> /ext/com_dotnet com_extension.c com_persist.c /ext/ctype >> ctype.c /ext/curl interface.c /ext/date php_date.c /ext/dba dba.c /e >> >> >> Dmitry Stogov wrote: >> > dmitry Thu Sep 27 18:00:49 2007 UTC >> > >> > Modified files: (Branch: PHP_5_3) >> > /php-src NEWS >> > /ZendEngine2 zend.h zend_API.c zend_API.h >> zend_builtin_functions.c >> > zend_compile.c zend_compile.h zend_exceptions.c >> > zend_execute.c zend_execute.h >> zend_execute_API.c >> > zend_hash.c zend_hash.h zend_ini.c zend_ini.h >> > zend_interfaces.c zend_modules.h zend_opcode.c >> ... >> > Log: >> > Improved memory usage by movig constants to read only memory. >> > (Dmitry, Pierre) >> > >> > >> > >> >> Will there be an ABI version dump? >> >> Andrey >> -- Johannes Schlüter http://schlueters.de -- 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) / NEWS /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c com_persist.c /ext/ctype ctype.c /ext/curl interface.c
Yes, of course. I'll update it soon. I am going to backport several other patches nearest days, so I'm not sure if I should update version every day. Thanks. Dmitry. > -Original Message- > From: Andrey Hristov [mailto:[EMAIL PROTECTED] > Sent: Friday, September 28, 2007 7:18 PM > To: Dmitry Stogov > Cc: php-cvs@lists.php.net > Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS > /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c > /ext/com_dotnet com_extension.c com_persist.c /ext/ctype > ctype.c /ext/curl interface.c /ext/date php_date.c /ext/dba dba.c /e > > > Dmitry Stogov wrote: > > dmitry Thu Sep 27 18:00:49 2007 UTC > > > > Modified files: (Branch: PHP_5_3) > > /php-srcNEWS > > /ZendEngine2zend.h zend_API.c zend_API.h > zend_builtin_functions.c > > zend_compile.c zend_compile.h zend_exceptions.c > > zend_execute.c zend_execute.h > zend_execute_API.c > > zend_hash.c zend_hash.h zend_ini.c zend_ini.h > > zend_interfaces.c zend_modules.h zend_opcode.c > ... > > Log: > > Improved memory usage by movig constants to read only memory. > > (Dmitry, Pierre) > > > > > > > > Will there be an ABI version dump? > > Andrey > -- 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) / NEWS /ext/bcmath bcmath.c /ext/bz2 bz2.c /ext/calendar calendar.c /ext/com_dotnet com_extension.c com_persist.c /ext/ctype ctype.c /ext/curl interface.c /e
Dmitry Stogov wrote: > dmitryThu Sep 27 18:00:49 2007 UTC > > Modified files: (Branch: PHP_5_3) > /php-src NEWS > /ZendEngine2 zend.h zend_API.c zend_API.h zend_builtin_functions.c > zend_compile.c zend_compile.h zend_exceptions.c > zend_execute.c zend_execute.h zend_execute_API.c > zend_hash.c zend_hash.h zend_ini.c zend_ini.h > zend_interfaces.c zend_modules.h zend_opcode.c ... > Log: > Improved memory usage by movig constants to read only memory. (Dmitry, > Pierre) > > > Will there be an ABI version dump? Andrey -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
janiFri Sep 28 13:06:22 2007 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
nuke unsued variable
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.875&r2=1.876&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.875
php-src/ext/standard/basic_functions.c:1.876
--- php-src/ext/standard/basic_functions.c:1.875Fri Sep 28 11:52:49 2007
+++ php-src/ext/standard/basic_functions.c Fri Sep 28 13:06:22 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.875 2007/09/28 11:52:49 jani Exp $ */
+/* $Id: basic_functions.c,v 1.876 2007/09/28 13:06:22 jani Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4803,7 +4803,6 @@
{
char *varname;
int varname_len;
- char *value;
zval *retval;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&", &varname,
&varname_len, UG(utf8_conv)) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter filter.c
janiFri Sep 28 12:54:42 2007 UTC
Modified files:
/php-src/ext/filter filter.c
Log:
- Fix compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.87&r2=1.88&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.87 php-src/ext/filter/filter.c:1.88
--- php-src/ext/filter/filter.c:1.87Thu Sep 27 18:28:39 2007
+++ php-src/ext/filter/filter.c Fri Sep 28 12:54:42 2007
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: filter.c,v 1.87 2007/09/27 18:28:39 dmitry Exp $ */
+/* $Id: filter.c,v 1.88 2007/09/28 12:54:42 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -275,7 +275,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.87 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.88 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -637,7 +637,7 @@
static void php_filter_array_handler(zval *input, zval **op, zval
*return_value TSRMLS_DC) /* {{{ */
{
- char *arg_key;
+ zstr arg_key;
uint arg_key_len;
ulong index;
HashPosition pos;
@@ -673,8 +673,8 @@
zval_dtor(return_value);
RETURN_FALSE;
}
- if (zend_hash_find(Z_ARRVAL_P(input), arg_key,
arg_key_len, (void **)&tmp) != SUCCESS) {
- add_assoc_null_ex(return_value, arg_key,
arg_key_len);
+ if (zend_hash_find(Z_ARRVAL_P(input), arg_key.s,
arg_key_len, (void **)&tmp) != SUCCESS) {
+ add_assoc_null_ex(return_value, arg_key.s,
arg_key_len);
} else {
zval *nval;
@@ -684,7 +684,7 @@
INIT_PZVAL(nval);
php_filter_call(&nval, -1, arg_elm, 0,
FILTER_REQUIRE_SCALAR TSRMLS_CC);
- add_assoc_zval_ex(return_value, arg_key,
arg_key_len, nval);
+ add_assoc_zval_ex(return_value, arg_key.s,
arg_key_len, nval);
}
}
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c
janiFri Sep 28 12:52:12 2007 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
- Fix compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.381&r2=1.382&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.381 php-src/ext/gd/gd.c:1.382
--- php-src/ext/gd/gd.c:1.381 Thu Sep 27 18:28:39 2007
+++ php-src/ext/gd/gd.c Fri Sep 28 12:52:12 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.381 2007/09/27 18:28:39 dmitry Exp $ */
+/* $Id: gd.c,v 1.382 2007/09/28 12:52:12 jani Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2040,7 +2040,7 @@
}
}
/* }}} */
-#endif PHP_WIN32
+#endif /* PHP_WIN32 */
#ifdef HAVE_GD_BUNDLED
/* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor
[, int ignoretransparent]) U
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
janiFri Sep 28 11:52:49 2007 UTC Modified files: /php-src/ext/standard basic_functions.c Log: ws + cs http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.874&r2=1.875&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.874 php-src/ext/standard/basic_functions.c:1.875 --- php-src/ext/standard/basic_functions.c:1.874Fri Sep 28 02:04:28 2007 +++ php-src/ext/standard/basic_functions.c Fri Sep 28 11:52:49 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.874 2007/09/28 02:04:28 jani Exp $ */ +/* $Id: basic_functions.c,v 1.875 2007/09/28 11:52:49 jani Exp $ */ #include "php.h" #include "php_streams.h" @@ -3308,7 +3308,7 @@ PHP_FE(cosh, arginfo_cosh) PHP_FE(tanh, arginfo_tanh) -#ifdef HAVE_ASINH +#ifdef HAVE_ASINH PHP_FE(asinh, arginfo_asinh) #endif #ifdef HAVE_ACOSH @@ -3362,6 +3362,7 @@ #ifdef HAVE_GETOPT PHP_FE(getopt, arginfo_getopt) #endif + #ifdef HAVE_GETLOADAVG PHP_FE(sys_getloadavg, arginfo_sys_getloadavg) #endif @@ -3432,7 +3433,7 @@ PHP_FE(parse_ini_file, arginfo_parse_ini_file) #if ZEND_DEBUG PHP_FE(dump_config_hash, arginfo_dump_config_hash) -#endif +#endif PHP_FE(is_uploaded_file, arginfo_is_uploaded_file) PHP_FE(move_uploaded_file, arginfo_move_uploaded_file) @@ -3456,7 +3457,7 @@ /* functions from type.c */ PHP_FE(intval, arginfo_intval) PHP_FE(floatval, arginfo_floatval) - PHP_FALIAS(doubleval, floatval, arginfo_floatval) + PHP_FALIAS(doubleval, floatval, arginfo_floatval) PHP_FE(strval, arginfo_strval) PHP_FE(gettype, arginfo_gettype) PHP_FE(settype, arginfo_settype) @@ -3509,7 +3510,7 @@ PHP_FE(file, arginfo_file) PHP_FE(file_get_contents, arginfo_file_get_contents) PHP_FE(file_put_contents, arginfo_file_put_contents) - PHP_FE(stream_select, arginfo_stream_select) + PHP_FE(stream_select, arginfo_stream_select) PHP_FE(stream_context_create, arginfo_stream_context_create) PHP_FE(stream_context_set_params, arginfo_stream_context_set_params) PHP_FE(stream_context_set_option, arginfo_stream_context_set_option) @@ -3519,9 +3520,9 @@ PHP_FE(stream_filter_append, arginfo_stream_filter_append) PHP_FE(stream_filter_remove,
[PHP-CVS] Re: [PHP-DEV] Re: cvs: php-src(PHP_5_2) / run-tests.php /ext/bz2/tests 005.phpt /ext/standard/tests/general_functions phpcredits.phpt phpinfo.phpt /ext/standard/tests/strings sha1.phpt /
nlopess Fri Sep 14 15:28:04 2007 UTC Log: changes to run-tests.php: - change %s to %a - make %s = [^\r\n]+ - fix tests accordingly I think this is a very bad change. While tests of bundled extensions can be updated accordingly, pecl extension tests have no way to be version agnostic in this regard. Mike - that's a fair point. When we looked through the PHP tests we found that the vast majority (all except 4) relied on the %s behaviour as is is currently implemented - that is *not* matching over a line end. Only 4 tests were actually intentionally using %s to match over line endings. From what you say it sounds as though many more of the PECL tests behave this way? Exactly. Although this may (and does) break some tests, the vast majority of the tests should continue working correctly. I think that the change is important enough to award this BC break. In PECL extensions, if you really need the old behavior, you can always use the --EXPECTREGEX-- section. Nuno -- 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) /main php_ini.c php_ini.h
janiFri Sep 28 10:23:38 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main php_ini.c php_ini.h
Log:
MFH: Fixed win32 build.
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.15.2.1&r2=1.136.2.4.2.15.2.2&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.15.2.1
php-src/main/php_ini.c:1.136.2.4.2.15.2.2
--- php-src/main/php_ini.c:1.136.2.4.2.15.2.1 Fri Sep 28 02:05:09 2007
+++ php-src/main/php_ini.c Fri Sep 28 10:23:38 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.136.2.4.2.15.2.1 2007/09/28 02:05:09 jani Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.15.2.2 2007/09/28 10:23:38 jani Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -164,7 +164,7 @@
/* {{{ config_zval_dtor
*/
-void config_zval_dtor(zval *zvalue)
+PHPAPI void config_zval_dtor(zval *zvalue)
{
if (Z_TYPE_P(zvalue) == IS_ARRAY) {
zend_hash_destroy(Z_ARRVAL_P(zvalue));
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.h?r1=1.45.2.3.2.3.2.1&r2=1.45.2.3.2.3.2.2&diff_format=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.45.2.3.2.3.2.1
php-src/main/php_ini.h:1.45.2.3.2.3.2.2
--- php-src/main/php_ini.h:1.45.2.3.2.3.2.1 Fri Sep 28 02:05:09 2007
+++ php-src/main/php_ini.h Fri Sep 28 10:23:38 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.h,v 1.45.2.3.2.3.2.1 2007/09/28 02:05:09 jani Exp $ */
+/* $Id: php_ini.h,v 1.45.2.3.2.3.2.2 2007/09/28 10:23:38 jani Exp $ */
#ifndef PHP_INI_H
#define PHP_INI_H
@@ -24,7 +24,7 @@
#include "zend_ini.h"
BEGIN_EXTERN_C()
-void config_zval_dtor(zval *zvalue);
+PHPAPI void config_zval_dtor(zval *zvalue);
int php_init_config(TSRMLS_D);
int php_shutdown_config(void);
void php_ini_register_extensions(TSRMLS_D);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_ini.c php_ini.h
janiFri Sep 28 10:23:14 2007 UTC
Modified files:
/php-src/main php_ini.c php_ini.h
Log:
- Fix win32 build.
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.157&r2=1.158&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.157 php-src/main/php_ini.c:1.158
--- php-src/main/php_ini.c:1.157Fri Sep 28 02:04:28 2007
+++ php-src/main/php_ini.c Fri Sep 28 10:23:14 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.157 2007/09/28 02:04:28 jani Exp $ */
+/* $Id: php_ini.c,v 1.158 2007/09/28 10:23:14 jani Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -164,7 +164,7 @@
/* {{{ config_zval_dtor
*/
-void config_zval_dtor(zval *zvalue)
+PHPAPI void config_zval_dtor(zval *zvalue)
{
if (Z_TYPE_P(zvalue) == IS_ARRAY) {
zend_hash_destroy(Z_ARRVAL_P(zvalue));
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.h?r1=1.52&r2=1.53&diff_format=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.52 php-src/main/php_ini.h:1.53
--- php-src/main/php_ini.h:1.52 Fri Sep 28 02:04:28 2007
+++ php-src/main/php_ini.h Fri Sep 28 10:23:14 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.h,v 1.52 2007/09/28 02:04:28 jani Exp $ */
+/* $Id: php_ini.h,v 1.53 2007/09/28 10:23:14 jani Exp $ */
#ifndef PHP_INI_H
#define PHP_INI_H
@@ -24,7 +24,7 @@
#include "zend_ini.h"
BEGIN_EXTERN_C()
-void config_zval_dtor(zval *zvalue);
+PHPAPI void config_zval_dtor(zval *zvalue);
int php_init_config(TSRMLS_D);
int php_shutdown_config(void);
void php_ini_register_extensions(TSRMLS_D);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] Re: cvs: php-src(PHP_5_2) / run-tests.php /ext/bz2/tests 005.phpt /ext/standard/tests/general_functions phpcredits.phpt phpinfo.phpt /ext/standard/tests/strings sha1.phpt /
Michael Wallner wrote: Nuno Lopes wrote: nlopess Fri Sep 14 15:28:04 2007 UTC Log: changes to run-tests.php: - change %s to %a - make %s = [^\r\n]+ - fix tests accordingly I think this is a very bad change. While tests of bundled extensions can be updated accordingly, pecl extension tests have no way to be version agnostic in this regard. Mike - that's a fair point. When we looked through the PHP tests we found that the vast majority (all except 4) relied on the %s behaviour as is is currently implemented - that is *not* matching over a line end. Only 4 tests were actually intentionally using %s to match over line endings. From what you say it sounds as though many more of the PECL tests behave this way? Zoe Slattery -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_2) / run-tests.php /ext/bz2/tests 005.phpt /ext/standard/tests/general_functions phpcredits.phpt phpinfo.phpt /ext/standard/tests/strings sha1.phpt /ext/zlib/tests
Nuno Lopes wrote: > nlopess Fri Sep 14 15:28:04 2007 UTC > Log: > changes to run-tests.php: > - change %s to %a > - make %s = [^\r\n]+ > - fix tests accordingly I think this is a very bad change. While tests of bundled extensions can be updated accordingly, pecl extension tests have no way to be version agnostic in this regard. -- Michael -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
