[PHP-CVS] cvs: php-src / NEWS
bjori Tue Dec 9 08:22:09 2008 UTC Modified files: /php-srcNEWS Log: - Remove items that already done in earlier branches - It doesnt hurt to say what new functions do http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2173&r2=1.2174&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2173 php-src/NEWS:1.2174 --- php-src/NEWS:1.2173 Sat Nov 22 14:50:00 2008 +++ php-src/NEWSTue Dec 9 08:22:08 2008 @@ -30,9 +30,6 @@ operands. (Dmitry) - Removed Freetype 1.x and GD 1.x support from GD extension. (Pierre) -- Moved extensions to PECL: - . ext/ncurses (Hartmut) - - Improved ext/zlib; re-implemented non-file related functionality. (Mike) - Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike) - Improved ext/mhash: (Mike) @@ -43,11 +40,11 @@ - Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- Added streams features: - . Second optional parameter to stream_context_create() to -set params during context creation. (Sara) - . "context" and "binary_pipes" params in "other_options" arg. (Sara) - . stream_resolve_include_path(). (Sara) +- Added "context" and "binary_pipes" params in "other_options" for proc_open(). + (Sara) +- Added stream_resolve_include_path() function which checks which file fopen() + with a relative path will open. (Sara) - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) + -- 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) / NEWS /ext/standard dir.c
bjori Tue Dec 9 09:03:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/standard dir.c
Log:
MFH: - Changed opendir/dir/scandir to use default context when no context
argument is passed. (Sara)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.403&r2=1.2027.2.547.2.965.2.404&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.403
php-src/NEWS:1.2027.2.547.2.965.2.404
--- php-src/NEWS:1.2027.2.547.2.965.2.403 Wed Dec 3 21:01:52 2008
+++ php-src/NEWSTue Dec 9 09:03:37 2008
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 200?, PHP 5.3.0 Alpha 4
+- Changed opendir/dir/scandir to use default context
+ when no context argument is passed. (Sara)
04 Dec 2008, PHP 5.3.0 Alpha 3
- Upgraded bundled PCRE to version 7.8. (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12.2.11&r2=1.147.2.3.2.12.2.12&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.11
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.12
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.11 Mon Aug 11 23:14:36 2008
+++ php-src/ext/standard/dir.c Tue Dec 9 09:03:38 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.11 2008/08/11 23:14:36 lbarnaud Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.12 2008/12/09 09:03:38 bjori Exp $ */
/* {{{ includes/startup/misc */
@@ -213,9 +213,7 @@
RETURN_NULL();
}
- if (zcontext) {
- context = php_stream_context_from_zval(zcontext, 0);
- }
+ context = php_stream_context_from_zval(zcontext, 0);
dirp = php_stream_opendir(dirname, ENFORCE_SAFE_MODE|REPORT_ERRORS,
context);
@@ -558,9 +556,7 @@
RETURN_FALSE;
}
- if (zcontext) {
- context = php_stream_context_from_zval(zcontext, 0);
- }
+ context = php_stream_context_from_zval(zcontext, 0);
if (!flags) {
n = php_stream_scandir(dirn, &namelist, context, (void *)
php_stream_dirent_alphasort);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
bjori Tue Dec 9 09:04:01 2008 UTC Modified files: /php-srcNEWS Log: Merged to 5_3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2174&r2=1.2175&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2174 php-src/NEWS:1.2175 --- php-src/NEWS:1.2174 Tue Dec 9 08:22:08 2008 +++ php-src/NEWSTue Dec 9 09:04:00 2008 @@ -5,8 +5,6 @@ - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) -- Changed opendir/dir/scandir to use default context - when no context argument is passed. (Sara) - Changed open_basedir to allow tightening in runtime contexts. (Sara) - Changed allow_url_fopen/allow_url_include to allow per-wrapper enable/disable and runtime tightening. (Sara) -- 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_3) / run-tests.php
Johannes Schlüter wrote:
On Mon, 2008-12-08 at 12:36 +, "Jani Taskinen" wrote:
+// If __DIR__ is not defined, define it
+if (!defined('__DIR__')) {
defined() will always return true ...
Huh? Are you absolutely sure now? :) What would the use of defined() be
if it didn't do what it's supposed to do? :D
+ define('__DIR__', realpath(dirname(__FILE__)));
.. but this will never throw an error.
IF defined() doesn't do what it's supposed to..
$ sapi/cli/php -d error_reporting=E_ALL \
-r 'var_dump(__DIR__); var_dump(defined("__DIR__"));
var_dump(define("__DIR__", 32));'
string(39) "/home/johannes/src/php/5.3/debug-notsrm"
bool(false)
bool(true)
Maybe it's better to check for the version there ...
Works fine for me (no errors):
$ php -d error_reporting=E_ALL -r 'var_dump(defined("__DIR__"));'
bool(false)
[EMAIL PROTECTED] ~]$ php -v
PHP 5.2.9-dev (cli) (built: Dec 8 2008 12:46:20) (DEBUG)
Copyright (c) 1997-2008 The PHP Group
Zend Engine v2.2.0, Copyright (c) 1998-2008 Zend Technologies
[EMAIL PROTECTED] ~]$ src/build/php_5_3/sapi/cli/php -d
error_reporting=E_ALL -r 'var_dump(defined("__DIR__"));'
bool(false)
--Jani
--
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) /ext/zip Makefile.frag config.m4
pajoye Tue Dec 9 09:21:59 2008 UTC Removed files: (Branch: PHP_5_2) /php-src/ext/zipMakefile.frag Modified files: /php-src/ext/zipconfig.m4 Log: - not used anymore http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.8.2.5&r2=1.8.2.6&diff_format=u Index: php-src/ext/zip/config.m4 diff -u php-src/ext/zip/config.m4:1.8.2.5 php-src/ext/zip/config.m4:1.8.2.6 --- php-src/ext/zip/config.m4:1.8.2.5 Thu Oct 23 16:13:50 2008 +++ php-src/ext/zip/config.m4 Tue Dec 9 09:21:59 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.2.5 2008/10/23 16:13:50 pajoye Exp $ +dnl $Id: config.m4,v 1.8.2.6 2008/12/09 09:21:59 pajoye Exp $ dnl PHP_ARG_ENABLE(zip, for zip archive read/writesupport, @@ -70,5 +70,4 @@ PHP_SUBST(ZIP_SHARED_LIBADD) dnl so we always include the known-good working hack. - PHP_ADD_MAKEFILE_FRAGMENT fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
Hannes Magnusson wrote: bjori Tue Dec 9 08:22:09 2008 UTC Modified files: /php-src NEWS Log: - Remove items that already done in earlier branches - It doesnt hurt to say what new functions do NEWS is not documentation. That's elsewhere. ;) --Jani http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2173&r2=1.2174&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2173 php-src/NEWS:1.2174 --- php-src/NEWS:1.2173 Sat Nov 22 14:50:00 2008 +++ php-src/NEWSTue Dec 9 08:22:08 2008 @@ -30,9 +30,6 @@ operands. (Dmitry) - Removed Freetype 1.x and GD 1.x support from GD extension. (Pierre) -- Moved extensions to PECL: - . ext/ncurses (Hartmut) - - Improved ext/zlib; re-implemented non-file related functionality. (Mike) - Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike) - Improved ext/mhash: (Mike) @@ -43,11 +40,11 @@ - Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- Added streams features: - . Second optional parameter to stream_context_create() to -set params during context creation. (Sara) - . "context" and "binary_pipes" params in "other_options" arg. (Sara) - . stream_resolve_include_path(). (Sara) +- Added "context" and "binary_pipes" params in "other_options" for proc_open(). + (Sara) +- Added stream_resolve_include_path() function which checks which file fopen() + with a relative path will open. (Sara) - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) + -- 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) / NEWS
janiTue Dec 9 10:50:09 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: style http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.406&r2=1.2027.2.547.2.965.2.407&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.406 php-src/NEWS:1.2027.2.547.2.965.2.407 --- php-src/NEWS:1.2027.2.547.2.965.2.406 Tue Dec 9 10:20:11 2008 +++ php-src/NEWSTue Dec 9 10:50:08 2008 @@ -1,11 +1,11 @@ PHPNEWS ||| ?? ??? 200?, PHP 5.3.0 Alpha 4 -- Changed opendir/dir/scandir to use default context - when no context argument is passed. (Sara) +- Changed opendir(), dir() and scandir() to use default context when no context + argument is passed. (Sara) - Changed open_basedir to allow tightening in runtime contexts. (Sara) -- Fixed bug #46811 ini_set() doesn't return false on failure. (Hannes) +- Fixed bug #46811 (ini_set() doesn't return false on failure). (Hannes) 04 Dec 2008, PHP 5.3.0 Alpha 3 - Upgraded bundled PCRE to version 7.8. (Nuno) @@ -21,7 +21,7 @@ - Changed floating point behaviour to consistently use double precision on all platforms and with all compilers. (Christian Seiler) - Changed round() to act more intuitively when rounding to a certain precision - and to correctly round very large and very small exponents. (Christian Seiler) + and round very large and very small exponents correctly. (Christian Seiler) - Changed fileinfo to no longer send errors to stderr. (Scott) - Added support for namespaces with brackets. (Greg) @@ -39,9 +39,9 @@ - Added concatenation option to bz2.decompress stream filter. (Keisial at gmail dot com, Greg) - Added support for using compressed connections with PDO_mysql. (Johannes) + - Implemented FR #46595 (Use cc as the default compiler). (David Soria Parra) -- Implemented FR #46513 (Missing compiler flags for suncc). - (David Soria Parra) +- Implemented FR #46513 (Missing compiler flags for suncc). (David Soria Parra) - Deprecated define_syslog_variables(). (Kalle) - Deprecated ereg extension. (Felipe) -- 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/standard credits.c
janiTue Dec 9 10:53:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard credits.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits.c?r1=1.36.2.4.2.4.2.5&r2=1.36.2.4.2.4.2.6&diff_format=u
Index: php-src/ext/standard/credits.c
diff -u php-src/ext/standard/credits.c:1.36.2.4.2.4.2.5
php-src/ext/standard/credits.c:1.36.2.4.2.4.2.6
--- php-src/ext/standard/credits.c:1.36.2.4.2.4.2.5 Tue Nov 4 15:58:55 2008
+++ php-src/ext/standard/credits.c Tue Dec 9 10:53:47 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: credits.c,v 1.36.2.4.2.4.2.5 2008/11/04 15:58:55 helly Exp $ */
+/* $Id: credits.c,v 1.36.2.4.2.4.2.6 2008/12/09 10:53:47 jani Exp $ */
#include "php.h"
#include "info.h"
@@ -63,7 +63,7 @@
php_info_print_table_header(2, "Contribution", "Authors");
CREDIT_LINE("Zend Scripting Language Engine", "Andi Gutmans,
Zeev Suraski, Stanislav Malyshev, Marcus Boerger, Dmitry Stogov");
CREDIT_LINE("Extension Module API", "Andi Gutmans, Zeev
Suraski, Andrei Zmievski");
- CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken,
Sascha Schumann");
+ CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken,
Sascha Schumann, Jani Taskinen");
CREDIT_LINE("Win32 Port", "Shane Caraveo, Zeev Suraski, Wez
Furlong");
CREDIT_LINE("Server API (SAPI) Abstraction Layer", "Andi
Gutmans, Shane Caraveo, Zeev Suraski");
CREDIT_LINE("Streams Abstraction Layer", "Wez Furlong, Sara
Golemon");
--
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) /ext/standard credits.c
janiTue Dec 9 10:54:04 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard credits.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits.c?r1=1.36.2.4.2.7&r2=1.36.2.4.2.8&diff_format=u
Index: php-src/ext/standard/credits.c
diff -u php-src/ext/standard/credits.c:1.36.2.4.2.7
php-src/ext/standard/credits.c:1.36.2.4.2.8
--- php-src/ext/standard/credits.c:1.36.2.4.2.7 Wed Jun 18 05:21:08 2008
+++ php-src/ext/standard/credits.c Tue Dec 9 10:54:04 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: credits.c,v 1.36.2.4.2.7 2008/06/18 05:21:08 philip Exp $ */
+/* $Id: credits.c,v 1.36.2.4.2.8 2008/12/09 10:54:04 jani Exp $ */
#include "php.h"
#include "info.h"
@@ -65,7 +65,7 @@
php_info_print_table_header(2, "Contribution", "Authors");
CREDIT_LINE("Zend Scripting Language Engine", "Andi Gutmans,
Zeev Suraski");
CREDIT_LINE("Extension Module API", "Andi Gutmans, Zeev
Suraski, Andrei Zmievski");
- CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken,
Sascha Schumann");
+ CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken,
Sascha Schumann, Jani Taskinen");
CREDIT_LINE("Win32 Port", "Shane Caraveo, Zeev Suraski, Wez
Furlong");
CREDIT_LINE("Server API (SAPI) Abstraction Layer", "Andi
Gutmans, Shane Caraveo, Zeev Suraski");
CREDIT_LINE("Streams Abstraction Layer", "Wez Furlong, Sara
Golemon");
--
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) / NEWS
bjori Tue Dec 9 10:12:23 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.404&r2=1.2027.2.547.2.965.2.405&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.404 php-src/NEWS:1.2027.2.547.2.965.2.405 --- php-src/NEWS:1.2027.2.547.2.965.2.404 Tue Dec 9 09:03:37 2008 +++ php-src/NEWSTue Dec 9 10:12:21 2008 @@ -4,6 +4,8 @@ - Changed opendir/dir/scandir to use default context when no context argument is passed. (Sara) +- Fixed bug #46811 ini_set() doesn't return false on failure. (Hannes) + 04 Dec 2008, PHP 5.3.0 Alpha 3 - Upgraded bundled PCRE to version 7.8. (Nuno) - Upgraded bundled sqlite to version 3.6.6.2. (Scott, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php-src(PHP_5_3) / run-tests.php
Hannes Magnusson wrote:
On Tue, Dec 9, 2008 at 10:15, Jani Taskinen <[EMAIL PROTECTED]> wrote:
Johannes Schlüter wrote:
On Mon, 2008-12-08 at 12:36 +, "Jani Taskinen" wrote:
+// If __DIR__ is not defined, define it
+if (!defined('__DIR__')) {
defined() will always return true ...
Huh? Are you absolutely sure now? :) What would the use of defined() be if
it didn't do what it's supposed to do? :D
[..]
[EMAIL PROTECTED] ~]$ src/build/php_5_3/sapi/cli/php -d error_reporting=E_ALL
-r 'var_dump(defined("__DIR__"));'
bool(false)
Duh..I didn't realize it returned false ALWAYS.
defined() apparently doesn't work on magic constants (__LINE__,
__METHOD__, __FILE__...).
The docs don't mention this so I assume johannes found a bug he should report :)
Well, magical or not, they're still constants.
--Jani
--
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/standard/tests/directory open_basedir_001.phpt /main fopen_wrappers.c fopen_wrappers.h
Fail.
open_basedir can as of 5.3.0 be set at run time to tighten the path.
I.e. if open_basedir=/usr/local in php.ini you can
ini_set("open_basedir", "/usr/local/bin") at runtime.
trying to remove stuff from open_basedir (i.e. ini_set("open_basedir",
"/usr");) fails.
-Hannes
On Tue, Dec 9, 2008 at 11:20, Hannes Magnusson <[EMAIL PROTECTED]> wrote:
> bjori Tue Dec 9 10:20:11 2008 UTC
>
> Added files: (Branch: PHP_5_3)
>/php-src/ext/standard/tests/directory open_basedir_001.phpt
>
> Modified files:
>/php-srcNEWS
>/php-src/main fopen_wrappers.c fopen_wrappers.h
> Log:
> MFH: - Changed open_basedir to allow tightening in runtime contexts. (Sara)
> - Add test
>
>
>
> http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.405&r2=1.2027.2.547.2.965.2.406&diff_format=u
> Index: php-src/NEWS
> diff -u php-src/NEWS:1.2027.2.547.2.965.2.405
> php-src/NEWS:1.2027.2.547.2.965.2.406
> --- php-src/NEWS:1.2027.2.547.2.965.2.405 Tue Dec 9 10:12:21 2008
> +++ php-src/NEWSTue Dec 9 10:20:11 2008
> @@ -3,6 +3,7 @@
> ?? ??? 200?, PHP 5.3.0 Alpha 4
> - Changed opendir/dir/scandir to use default context
> when no context argument is passed. (Sara)
> +- Changed open_basedir to allow tightening in runtime contexts. (Sara)
>
> - Fixed bug #46811 ini_set() doesn't return false on failure. (Hannes)
>
> http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.175.2.3.2.13.2.13&r2=1.175.2.3.2.13.2.14&diff_format=u
> Index: php-src/main/fopen_wrappers.c
> diff -u php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.13
> php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.14
> --- php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.13 Mon Aug 11 15:33:02
> 2008
> +++ php-src/main/fopen_wrappers.c Tue Dec 9 10:20:11 2008
> @@ -17,7 +17,7 @@
>+--+
> */
>
> -/* $Id: fopen_wrappers.c,v 1.175.2.3.2.13.2.13 2008/08/11 15:33:02 lbarnaud
> Exp $ */
> +/* $Id: fopen_wrappers.c,v 1.175.2.3.2.13.2.14 2008/12/09 10:20:11 bjori Exp
> $ */
>
> /* {{{ includes
> */
> @@ -79,6 +79,62 @@
> #endif
> /* }}} */
>
> +/* {{{ OnUpdateBaseDir
> +Allows any change to open_basedir setting in during Startup and Shutdown
> events,
> +or a tightening during activation/runtime/deactivation */
> +PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
> +{
> + char **p, *pathbuf, *ptr, *end;
> +#ifndef ZTS
> + char *base = (char *) mh_arg2;
> +#else
> + char *base = (char *) ts_resource(*((int *) mh_arg2));
> +#endif
> +
> + p = (char **) (base + (size_t) mh_arg1);
> +
> + if (stage == PHP_INI_STAGE_STARTUP || stage ==
> PHP_INI_STAGE_SHUTDOWN) {
> + /* We're in a PHP_INI_SYSTEM context, no restrictions */
> + *p = new_value;
> + return SUCCESS;
> + }
> +
> + /* Otherwise we're in runtime */
> + if (!*p || !**p) {
> + /* open_basedir not set yet, go ahead and give it a value */
> + *p = new_value;
> + return SUCCESS;
> + }
> +
> + /* Shortcut: When we have a open_basedir and someone tries to unset,
> we know it'll fail */
> + if (!new_value || !*new_value) {
> + return FAILURE;
> + }
> +
> + /* Is the proposed open_basedir at least as restrictive as the
> current setting? */
> + ptr = pathbuf = estrdup(new_value);
> + while (ptr && *ptr) {
> + end = strchr(ptr, DEFAULT_DIR_SEPARATOR);
> + if (end != NULL) {
> + *end = '\0';
> + end++;
> + }
> + if (php_check_open_basedir_ex(ptr, 0 TSRMLS_CC) != 0) {
> + /* At least one portion of this open_basedir is less
> restrictive than the prior one, FAIL */
> + efree(pathbuf);
> + return FAILURE;
> + }
> + ptr = end;
> + }
> + efree(pathbuf);
> +
> + /* Everything checks out, set it */
> + *p = new_value;
> +
> + return SUCCESS;
> +}
> +/* }}} */
> +
> /* {{{ php_check_specific_open_basedir
>When open_basedir is not NULL, check if the given filename is located
> in
>open_basedir. Returns -1 if error or not in the open_basedir, else 0.
> http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.h?r1=1.44.2.1.2.2.2.4&r2=1.44.2.1.2.2.2.5&diff_format=u
> Index: php-src/main/fopen_wrappers.h
> diff -u php-src/main/fopen_wrappers.h:1.44.2.1.2.2.2.4
> php-src/main/fopen_wrappers.h:1.44.2.1.2.2.2.5
> --- php-src/main/fopen_wrappers.h:1.44.2.1.2.2.2.4 Mon Aug 11 15:33:02
> 2008
> +++ php-src/main/fopen_wrappers.h Tue Dec 9 10:20:11 2008
> @@ -16,13 +16,14 @@
>+--+
> */
>
> -/* $Id: fopen_wrappers.h,v 1.44.2.1.2.2.2.4 2008/08/11 15:33:02 lbarnaud Exp
> $ */
> +/* $Id: f
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sysvshm sysvshm.c /ext/sysvshm/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt
2008/6/27 Felipe Pena <[EMAIL PROTECTED]>: > felipe Fri Jun 27 00:22:18 2008 UTC > > Modified files: (Branch: PHP_5_3) >/php-src/ext/sysvshmsysvshm.c >/php-src/ext/sysvshm/tests 001.phpt 002.phpt 003.phpt 004.phpt >005.phpt 006.phpt 007.phpt > Log: > - New parameter parsing API This is totally different then HEAD. How about merging stuff from HEAD then to do complete rewrite in 5.3? We now have 3 completely different versions of pretty much exactly the same code. -Hannes -- 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/standard/tests/general_functions include_path.phpt
bjori Tue Dec 9 12:54:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions include_path.phpt Log: Fix test. You cannot set include_path as empty, and never could http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/include_path.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/include_path.phpt diff -u php-src/ext/standard/tests/general_functions/include_path.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/general_functions/include_path.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/general_functions/include_path.phpt:1.1.2.2.2.1 Mon Oct 1 12:40:54 2007 +++ php-src/ext/standard/tests/general_functions/include_path.phpt Tue Dec 9 12:54:01 2008 @@ -62,7 +62,7 @@ string(14) ".:/path/to/dir" NULL string(1) "." -string(1) "." +bool(false) string(1) "." NULL string(1) "." -- 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/directory open_basedir_001.phpt
bjori Tue Dec 9 10:21:27 2008 UTC Modified files: /php-src/ext/standard/tests/directory open_basedir_001.phpt Log: MFB: Add test for runtime tightening of open_basedir http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/open_basedir_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/directory/open_basedir_001.phpt diff -u /dev/null php-src/ext/standard/tests/directory/open_basedir_001.phpt:1.2 --- /dev/null Tue Dec 9 10:21:27 2008 +++ php-src/ext/standard/tests/directory/open_basedir_001.phpt Tue Dec 9 10:21:27 2008 @@ -0,0 +1,17 @@ +--TEST-- +openbase_dir runtime tightning +--INI-- +open_basedir=/usr/local +--FILE-- + +--EXPECT-- +string(10) "/usr/local" +string(14) "/usr/local/bin" +bool(false) +string(14) "/usr/local/bin" + -- 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 include_path.phpt
bjori Tue Dec 9 12:56:40 2008 UTC Modified files: /php-src/ext/standard/tests/general_functions include_path.phpt Log: MFB5.3: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/include_path.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/general_functions/include_path.phpt diff -u php-src/ext/standard/tests/general_functions/include_path.phpt:1.3 php-src/ext/standard/tests/general_functions/include_path.phpt:1.4 --- php-src/ext/standard/tests/general_functions/include_path.phpt:1.3 Tue May 27 00:04:31 2008 +++ php-src/ext/standard/tests/general_functions/include_path.phpt Tue Dec 9 12:56:39 2008 @@ -62,7 +62,7 @@ unicode(14) ".:/path/to/dir" NULL unicode(1) "." -unicode(1) "." +bool(false) unicode(1) "." NULL unicode(1) "." -- 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 main.c
bjori Tue Dec 9 10:23:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main main.c
Log:
Whoops. Missing bit from the open_basedir tightening MFH
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.36&r2=1.640.2.23.2.57.2.37&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.36
php-src/main/main.c:1.640.2.23.2.57.2.37
--- php-src/main/main.c:1.640.2.23.2.57.2.36Wed Nov 12 16:40:40 2008
+++ php-src/main/main.c Tue Dec 9 10:23:44 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.57.2.36 2008/11/12 16:40:40 felipe Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.37 2008/12/09 10:23:44 bjori Exp $ */
/* {{{ includes
*/
@@ -429,7 +429,7 @@
STD_PHP_INI_ENTRY("extension_dir",
PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty,
extension_dir, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("include_path",
PHP_INCLUDE_PATH, PHP_INI_ALL,OnUpdateStringUnempty,
include_path, php_core_globals, core_globals)
PHP_INI_ENTRY("max_execution_time", "30",
PHP_INI_ALL,OnUpdateTimeout)
- STD_PHP_INI_ENTRY("open_basedir", NULL,
PHP_INI_SYSTEM, OnUpdateString, open_basedir,
php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("open_basedir", NULL,
PHP_INI_ALL,OnUpdateBaseDir,open_basedir,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("safe_mode_exec_dir", PHP_SAFE_MODE_EXEC_DIR,
PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("file_uploads", "1",
PHP_INI_SYSTEM, OnUpdateBool, file_uploads,
php_core_globals, core_globals)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar/tests ini_set.phpt
bjori Tue Dec 9 13:02:28 2008 UTC Modified files: /php-src/ext/phar/tests ini_set.phpt Log: ini_set() should return false on failure, not return the orginal value and pretend everything is fine. http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/ini_set.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/ini_set.phpt diff -u php-src/ext/phar/tests/ini_set.phpt:1.6 php-src/ext/phar/tests/ini_set.phpt:1.7 --- php-src/ext/phar/tests/ini_set.phpt:1.6 Fri Aug 1 13:36:18 2008 +++ php-src/ext/phar/tests/ini_set.phpt Tue Dec 9 13:02:27 2008 @@ -25,7 +25,7 @@ string(1) "1" string(1) "1" string(1) "1" -string(1) "1" -string(1) "1" +bool(false) +bool(false) string(1) "1" string(1) "1" -- 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/phar/tests ini_set.phpt
bjori Tue Dec 9 13:02:40 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar/tests ini_set.phpt Log: MFH: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/ini_set.phpt?r1=1.4.2.1&r2=1.4.2.2&diff_format=u Index: php-src/ext/phar/tests/ini_set.phpt diff -u php-src/ext/phar/tests/ini_set.phpt:1.4.2.1 php-src/ext/phar/tests/ini_set.phpt:1.4.2.2 --- php-src/ext/phar/tests/ini_set.phpt:1.4.2.1 Fri Aug 1 13:38:47 2008 +++ php-src/ext/phar/tests/ini_set.phpt Tue Dec 9 13:02:40 2008 @@ -25,7 +25,7 @@ string(1) "1" string(1) "1" string(1) "1" -string(1) "1" -string(1) "1" +bool(false) +bool(false) string(1) "1" string(1) "1" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap/tests imap_fetch_overview_variation2.phpt
zoe Tue Dec 9 13:43:00 2008 UTC Modified files: /php-src/ext/imap/tests imap_fetch_overview_variation2.phpt Log: fix resource id http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt diff -u php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt:1.1 php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt:1.2 --- php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt:1.1 Mon Dec 8 19:10:45 2008 +++ php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt Tue Dec 9 13:43:00 2008 @@ -238,7 +238,7 @@ -- Testing with second argument value: NULL Syntax error in sequence --- Testing with second argument value: resource(7) of type (stream) +-- Testing with second argument value: resource(%d) of type (stream) Warning: imap_fetch_overview() expects parameter 2 to be %binary_string_optional%, resource given in %s on line %d Syntax error in sequence -- 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) / NEWS /ext/session session.c /ext/session/tests 001.phpt 005.phpt 006.phpt 007.phpt 012.phpt 019.phpt session_is_registered_basic.phpt session_is_registered_variatio
bjori Tue Dec 9 14:04:00 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/sessionsession.c
/php-src/ext/session/tests 001.phpt 005.phpt 006.phpt 007.phpt
012.phpt 019.phpt
session_is_registered_basic.phpt
session_is_registered_variation1.phpt
session_is_registered_variation2.phpt
session_is_registered_variation3.phpt
session_register_basic.phpt
session_register_variation1.phpt
session_register_variation2.phpt
session_register_variation3.phpt
session_register_variation4.phpt
session_unregister_basic.phpt
session_unregister_variation1.phpt
session_unregister_variation2.phpt
session_unregister_variation3.phpt
Log:
Deprecate session_register(), session_unregister() and
session_is_registered() (removed in HEAD)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.407&r2=1.2027.2.547.2.965.2.408&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.407
php-src/NEWS:1.2027.2.547.2.965.2.408
--- php-src/NEWS:1.2027.2.547.2.965.2.407 Tue Dec 9 10:50:08 2008
+++ php-src/NEWSTue Dec 9 14:03:57 2008
@@ -4,6 +4,8 @@
- Changed opendir(), dir() and scandir() to use default context when no context
argument is passed. (Sara)
- Changed open_basedir to allow tightening in runtime contexts. (Sara)
+- Deprecated session_register(), session_unregister() and
+ session_is_registered(). (Hannes)
- Fixed bug #46811 (ini_set() doesn't return false on failure). (Hannes)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.17&r2=1.417.2.8.2.40.2.18&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.17
php-src/ext/session/session.c:1.417.2.8.2.40.2.18
--- php-src/ext/session/session.c:1.417.2.8.2.40.2.17 Mon Nov 17 11:27:58 2008
+++ php-src/ext/session/session.c Tue Dec 9 14:03:58 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.417.2.8.2.40.2.17 2008/11/17 11:27:58 felipe Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.40.2.18 2008/12/09 14:03:58 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2099,9 +2099,9 @@
PHP_FE(session_id,arginfo_session_id)
PHP_FE(session_regenerate_id, arginfo_session_regenerate_id)
PHP_FE(session_decode,arginfo_session_decode)
- PHP_FE(session_register, arginfo_session_register)
- PHP_FE(session_unregister,arginfo_session_unregister)
- PHP_FE(session_is_registered, arginfo_session_is_registered)
+ PHP_DEP_FE(session_register, arginfo_session_register)
+ PHP_DEP_FE(session_unregister,arginfo_session_unregister)
+ PHP_DEP_FE(session_is_registered, arginfo_session_is_registered)
PHP_FE(session_encode,arginfo_session_void)
PHP_FE(session_start, arginfo_session_void)
PHP_FE(session_destroy, arginfo_session_void)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/001.phpt?r1=1.12&r2=1.12.6.1&diff_format=u
Index: php-src/ext/session/tests/001.phpt
diff -u php-src/ext/session/tests/001.phpt:1.12
php-src/ext/session/tests/001.phpt:1.12.6.1
--- php-src/ext/session/tests/001.phpt:1.12 Mon Jul 4 13:09:14 2005
+++ php-src/ext/session/tests/001.phpt Tue Dec 9 14:03:58 2008
@@ -30,5 +30,9 @@
print session_encode()."\n";
session_destroy();
---EXPECT--
+--EXPECTF--
+Deprecated: Function session_register() is deprecated in %s on line %d
+
+Deprecated: Function session_register() is deprecated in %s on line %d
baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}}
+
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/005.phpt?r1=1.14&r2=1.14.8.1&diff_format=u
Index: php-src/ext/session/tests/005.phpt
diff -u php-src/ext/session/tests/005.phpt:1.14
php-src/ext/session/tests/005.phpt:1.14.8.1
--- php-src/ext/session/tests/005.phpt:1.14 Sun Nov 30 13:57:16 2003
+++ php-src/ext/session/tests/005.phpt Tue Dec 9 14:03:58 2008
@@ -84,7 +84,7 @@
session_destroy();
?>
---EXPECT--
+--EXPECTF--
OPEN: PHPSESSID
READ: abtest
object(foo)#2 (2) {
@@ -106,6 +106,8 @@
CLOSE
OPEN: PHPSESSID
READ: abtest
+
+Deprecated: Function session_register() is deprecated in %s on line %d
object(foo)#4 (2) {
["bar"]=>
string(2) "ok"
http://cvs.php.net/viewvc.cgi/php-src/ext/session
Re: [PHP-CVS] Re: cvs: php-src(PHP_5_3) / run-tests.php
On Tue, Dec 9, 2008 at 10:15, Jani Taskinen <[EMAIL PROTECTED]> wrote:
> Johannes Schlüter wrote:
>>
>> On Mon, 2008-12-08 at 12:36 +, "Jani Taskinen" wrote:
>>>
>>> +// If __DIR__ is not defined, define it
>>> +if (!defined('__DIR__')) {
>>
>> defined() will always return true ...
>
> Huh? Are you absolutely sure now? :) What would the use of defined() be if
> it didn't do what it's supposed to do? :D
[..]
> [EMAIL PROTECTED] ~]$ src/build/php_5_3/sapi/cli/php -d error_reporting=E_ALL
> -r 'var_dump(defined("__DIR__"));'
> bool(false)
defined() apparently doesn't work on magic constants (__LINE__,
__METHOD__, __FILE__...).
The docs don't mention this so I assume johannes found a bug he should report :)
-Hannes
--
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/imap/tests imap_fetch_overview_variation2.phpt
zoe Tue Dec 9 13:41:49 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/imap/tests imap_fetch_overview_variation2.phpt Log: fix resource id http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt diff -u php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt:1.1.2.2 php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt:1.1.2.3 --- php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt:1.1.2.2 Mon Dec 8 19:12:39 2008 +++ php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt Tue Dec 9 13:41:49 2008 @@ -238,7 +238,7 @@ -- Testing with second argument value: NULL Syntax error in sequence --- Testing with second argument value: resource(7) of type (stream) +-- Testing with second argument value: resource(%d) of type (stream) Warning: imap_fetch_overview() expects parameter 2 to be %binary_string_optional%, resource given in %s on line %d Syntax error in sequence -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard credits.c
janiTue Dec 9 10:53:29 2008 UTC
Modified files:
/php-src/ext/standard credits.c
Log:
- cat, tail, lift :)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits.c?r1=1.50&r2=1.51&diff_format=u
Index: php-src/ext/standard/credits.c
diff -u php-src/ext/standard/credits.c:1.50 php-src/ext/standard/credits.c:1.51
--- php-src/ext/standard/credits.c:1.50 Wed Jun 18 05:17:55 2008
+++ php-src/ext/standard/credits.c Tue Dec 9 10:53:29 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: credits.c,v 1.50 2008/06/18 05:17:55 philip Exp $ */
+/* $Id: credits.c,v 1.51 2008/12/09 10:53:29 jani Exp $ */
#include "php.h"
#include "info.h"
@@ -66,7 +66,7 @@
php_info_print_table_header(2, "Contribution", "Authors");
CREDIT_LINE("Zend Scripting Language Engine", "Andi Gutmans,
Zeev Suraski");
CREDIT_LINE("Extension Module API", "Andi Gutmans, Zeev
Suraski, Andrei Zmievski");
- CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken,
Sascha Schumann");
+ CREDIT_LINE("UNIX Build and Modularization", "Stig Bakken,
Sascha Schumann, Jani Taskinen");
CREDIT_LINE("Win32 Port", "Shane Caraveo, Zeev Suraski, Wez
Furlong");
CREDIT_LINE("Server API (SAPI) Abstraction Layer", "Andi
Gutmans, Shane Caraveo, Zeev Suraski");
CREDIT_LINE("Streams Abstraction Layer", "Wez Furlong, Sara
Golemon");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
bjori Tue Dec 9 10:21:54 2008 UTC Modified files: /php-srcNEWS Log: Merged to 5.3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2175&r2=1.2176&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2175 php-src/NEWS:1.2176 --- php-src/NEWS:1.2175 Tue Dec 9 09:04:00 2008 +++ php-src/NEWSTue Dec 9 10:21:53 2008 @@ -5,7 +5,6 @@ - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) -- Changed open_basedir to allow tightening in runtime contexts. (Sara) - Changed allow_url_fopen/allow_url_include to allow per-wrapper enable/disable and runtime tightening. (Sara) -- 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_2) /ext/zip Makefile.frag config.m4
..and now you're not installing the header files anymore at all. Intetional? --Jani p.s. Pay! Pierre-Alain Joye wrote: pajoye Tue Dec 9 09:21:59 2008 UTC Removed files: (Branch: PHP_5_2) /php-src/ext/zip Makefile.frag Modified files: /php-src/ext/zip config.m4 Log: - not used anymore http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.8.2.5&r2=1.8.2.6&diff_format=u Index: php-src/ext/zip/config.m4 diff -u php-src/ext/zip/config.m4:1.8.2.5 php-src/ext/zip/config.m4:1.8.2.6 --- php-src/ext/zip/config.m4:1.8.2.5 Thu Oct 23 16:13:50 2008 +++ php-src/ext/zip/config.m4 Tue Dec 9 09:21:59 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8.2.5 2008/10/23 16:13:50 pajoye Exp $ +dnl $Id: config.m4,v 1.8.2.6 2008/12/09 09:21:59 pajoye Exp $ dnl PHP_ARG_ENABLE(zip, for zip archive read/writesupport, @@ -70,5 +70,4 @@ PHP_SUBST(ZIP_SHARED_LIBADD) dnl so we always include the known-good working hack. - PHP_ADD_MAKEFILE_FRAGMENT fi -- 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) /ext/imap/tests imap_fetch_overview_variation2.phpt
zoe Tue Dec 9 13:40:25 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/imap/tests imap_fetch_overview_variation2.phpt Log: fix resource id http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt diff -u php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt:1.1.4.2 php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt:1.1.4.3 --- php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt:1.1.4.2 Mon Dec 8 19:14:03 2008 +++ php-src/ext/imap/tests/imap_fetch_overview_variation2.phpt Tue Dec 9 13:40:25 2008 @@ -238,6 +238,6 @@ -- Testing with second argument value: NULL Syntax error in sequence --- Testing with second argument value: resource(7) of type (stream) +-- Testing with second argument value: resource(%d) of type (stream) Syntax error in sequence ===DONE=== -- 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) / NEWS /ext/standard/tests/directory open_basedir_001.phpt /main fopen_wrappers.c fopen_wrappers.h
bjori Tue Dec 9 10:20:11 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/directory open_basedir_001.phpt
Modified files:
/php-srcNEWS
/php-src/main fopen_wrappers.c fopen_wrappers.h
Log:
MFH: - Changed open_basedir to allow tightening in runtime contexts. (Sara)
- Add test
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.405&r2=1.2027.2.547.2.965.2.406&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.405
php-src/NEWS:1.2027.2.547.2.965.2.406
--- php-src/NEWS:1.2027.2.547.2.965.2.405 Tue Dec 9 10:12:21 2008
+++ php-src/NEWSTue Dec 9 10:20:11 2008
@@ -3,6 +3,7 @@
?? ??? 200?, PHP 5.3.0 Alpha 4
- Changed opendir/dir/scandir to use default context
when no context argument is passed. (Sara)
+- Changed open_basedir to allow tightening in runtime contexts. (Sara)
- Fixed bug #46811 ini_set() doesn't return false on failure. (Hannes)
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.175.2.3.2.13.2.13&r2=1.175.2.3.2.13.2.14&diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.13
php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.14
--- php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.13 Mon Aug 11 15:33:02 2008
+++ php-src/main/fopen_wrappers.c Tue Dec 9 10:20:11 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.175.2.3.2.13.2.13 2008/08/11 15:33:02 lbarnaud
Exp $ */
+/* $Id: fopen_wrappers.c,v 1.175.2.3.2.13.2.14 2008/12/09 10:20:11 bjori Exp $
*/
/* {{{ includes
*/
@@ -79,6 +79,62 @@
#endif
/* }}} */
+/* {{{ OnUpdateBaseDir
+Allows any change to open_basedir setting in during Startup and Shutdown
events,
+or a tightening during activation/runtime/deactivation */
+PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
+{
+ char **p, *pathbuf, *ptr, *end;
+#ifndef ZTS
+ char *base = (char *) mh_arg2;
+#else
+ char *base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+ p = (char **) (base + (size_t) mh_arg1);
+
+ if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN) {
+ /* We're in a PHP_INI_SYSTEM context, no restrictions */
+ *p = new_value;
+ return SUCCESS;
+ }
+
+ /* Otherwise we're in runtime */
+ if (!*p || !**p) {
+ /* open_basedir not set yet, go ahead and give it a value */
+ *p = new_value;
+ return SUCCESS;
+ }
+
+ /* Shortcut: When we have a open_basedir and someone tries to unset, we
know it'll fail */
+ if (!new_value || !*new_value) {
+ return FAILURE;
+ }
+
+ /* Is the proposed open_basedir at least as restrictive as the current
setting? */
+ ptr = pathbuf = estrdup(new_value);
+ while (ptr && *ptr) {
+ end = strchr(ptr, DEFAULT_DIR_SEPARATOR);
+ if (end != NULL) {
+ *end = '\0';
+ end++;
+ }
+ if (php_check_open_basedir_ex(ptr, 0 TSRMLS_CC) != 0) {
+ /* At least one portion of this open_basedir is less
restrictive than the prior one, FAIL */
+ efree(pathbuf);
+ return FAILURE;
+ }
+ ptr = end;
+ }
+ efree(pathbuf);
+
+ /* Everything checks out, set it */
+ *p = new_value;
+
+ return SUCCESS;
+}
+/* }}} */
+
/* {{{ php_check_specific_open_basedir
When open_basedir is not NULL, check if the given filename is located in
open_basedir. Returns -1 if error or not in the open_basedir, else 0.
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.h?r1=1.44.2.1.2.2.2.4&r2=1.44.2.1.2.2.2.5&diff_format=u
Index: php-src/main/fopen_wrappers.h
diff -u php-src/main/fopen_wrappers.h:1.44.2.1.2.2.2.4
php-src/main/fopen_wrappers.h:1.44.2.1.2.2.2.5
--- php-src/main/fopen_wrappers.h:1.44.2.1.2.2.2.4 Mon Aug 11 15:33:02 2008
+++ php-src/main/fopen_wrappers.h Tue Dec 9 10:20:11 2008
@@ -16,13 +16,14 @@
+--+
*/
-/* $Id: fopen_wrappers.h,v 1.44.2.1.2.2.2.4 2008/08/11 15:33:02 lbarnaud Exp $
*/
+/* $Id: fopen_wrappers.h,v 1.44.2.1.2.2.2.5 2008/12/09 10:20:11 bjori Exp $ */
#ifndef FOPEN_WRAPPERS_H
#define FOPEN_WRAPPERS_H
BEGIN_EXTERN_C()
#include "php_globals.h"
+#include "php_ini.h"
PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC);
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
@@ -39,6 +40,8 @@
PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const
char *path, char **opened_path TSRMLS_DC);
PHPAPI char *php_strip_url_passwd(char *path);
+
+PHPAPI ZEND
[PHP-CVS] cvs: php-src /ext/date config.w32
pajoye Tue Dec 9 14:28:35 2008 UTC
Modified files:
/php-src/ext/date config.w32
Log:
- silent conversion warnings as it is not going to be "fixed" any time soon,
removing false positive alerts. noise--;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/config.w32?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/date/config.w32
diff -u php-src/ext/date/config.w32:1.9 php-src/ext/date/config.w32:1.10
--- php-src/ext/date/config.w32:1.9 Sat Aug 2 16:49:56 2008
+++ php-src/ext/date/config.w32 Tue Dec 9 14:28:35 2008
@@ -1,10 +1,12 @@
-// $Id: config.w32,v 1.9 2008/08/02 16:49:56 pajoye Exp $
+// $Id: config.w32,v 1.10 2008/12/09 14:28:35 pajoye Exp $
// vim:ft=javascript
EXTENSION("date", "php_date.c", false, "-Iext/date/lib");
ADD_SOURCES("ext/date/lib", "astro.c timelib.c dow.c parse_date.c parse_tz.c
tm2unixtime.c unixtime2tm.c parse_iso_intervals.c interval.c", "date");
AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');
+ADD_FLAG('CFLAGS_DATE', "/wd4244");
+
var tl_config = FSO.CreateTextFile("ext/date/lib/timelib_config.h", true);
tl_config.WriteLine("#include \"config.w32.h\"");
tl_config.Close();
--
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/date config.w32
pajoye Tue Dec 9 14:28:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date config.w32
Log:
- MFH: silent conversion warnings as it is not going to be "fixed" any time
soon, removing false positive alerts. noise--;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/config.w32?r1=1.5.2.1.4.3&r2=1.5.2.1.4.4&diff_format=u
Index: php-src/ext/date/config.w32
diff -u php-src/ext/date/config.w32:1.5.2.1.4.3
php-src/ext/date/config.w32:1.5.2.1.4.4
--- php-src/ext/date/config.w32:1.5.2.1.4.3 Sat Aug 2 16:50:35 2008
+++ php-src/ext/date/config.w32 Tue Dec 9 14:28:54 2008
@@ -1,10 +1,12 @@
-// $Id: config.w32,v 1.5.2.1.4.3 2008/08/02 16:50:35 pajoye Exp $
+// $Id: config.w32,v 1.5.2.1.4.4 2008/12/09 14:28:54 pajoye Exp $
// vim:ft=javascript
EXTENSION("date", "php_date.c", false, "-Iext/date/lib");
ADD_SOURCES("ext/date/lib", "astro.c timelib.c dow.c parse_date.c parse_tz.c
tm2unixtime.c unixtime2tm.c parse_iso_intervals.c interval.c", "date");
AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');
+ADD_FLAG('CFLAGS_DATE', "/wd4244");
+
var tl_config = FSO.CreateTextFile("ext/date/lib/timelib_config.h", true);
tl_config.WriteLine("#include \"config.w32.h\"");
tl_config.Close();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php-src(PHP_5_3) / run-tests.php
On Tue, 2008-12-09 at 10:56 +0100, Hannes Magnusson wrote: > defined() apparently doesn't work on magic constants (__LINE__, > __METHOD__, __FILE__...). > The docs don't mention this so I assume johannes found a bug he should report > :) If there is a bug it's in the docs I'd say as get_defined_constants(), constant() and probably others don't know them either and I don't think it's good to add special handling to a these functions. I didn't know that's not in the docs so I didn't report but can do :-) johannes -- 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/standard/tests/file tempnam_variation4.phpt
tony2001Tue Dec 9 14:48:42 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filetempnam_variation4.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation4.phpt?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation4.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.1.2.1.2.1 Wed Nov 26 10:10:19 2008 +++ php-src/ext/standard/tests/file/tempnam_variation4.phpt Tue Dec 9 14:48:41 2008 @@ -1080,4 +1080,4 @@ tempnamVar4.%s created in requested directory -- dir perms 777 -- tempnamVar4.%s created in requested directory -*** Done *** \ No newline at end of file +*** Done *** -- 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/file tempnam_variation4.phpt
tony2001Tue Dec 9 14:49:12 2008 UTC Modified files: /php-src/ext/standard/tests/filetempnam_variation4.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation4.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_variation4.phpt diff -u php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.4 php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.5 --- php-src/ext/standard/tests/file/tempnam_variation4.phpt:1.4 Wed Nov 26 17:48:40 2008 +++ php-src/ext/standard/tests/file/tempnam_variation4.phpt Tue Dec 9 14:49:12 2008 @@ -1080,4 +1080,4 @@ tempnamVar4.%s created in requested directory -- dir perms 777 -- tempnamVar4.%s created in requested directory -*** Done *** \ No newline at end of file +*** Done *** -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/run-test test005.phpt test008a.phpt
janiTue Dec 9 15:18:05 2008 UTC Modified files: /php-src/tests/run-test test005.phpt test008a.phpt Log: - fix tests http://cvs.php.net/viewvc.cgi/php-src/tests/run-test/test005.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/tests/run-test/test005.phpt diff -u php-src/tests/run-test/test005.phpt:1.8 php-src/tests/run-test/test005.phpt:1.9 --- php-src/tests/run-test/test005.phpt:1.8 Mon Jul 21 22:06:01 2008 +++ php-src/tests/run-test/test005.phpt Tue Dec 9 15:18:04 2008 @@ -24,7 +24,7 @@ ?> --EXPECTF-- unicode(1) "1" -unicode(5) "30719" +unicode(5) "32767" unicode(1) "0" unicode(1) "1" unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/tests/run-test/test008a.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/tests/run-test/test008a.phpt diff -u php-src/tests/run-test/test008a.phpt:1.7 php-src/tests/run-test/test008a.phpt:1.8 --- php-src/tests/run-test/test008a.phpt:1.7Mon Jul 21 22:06:01 2008 +++ php-src/tests/run-test/test008a.phptTue Dec 9 15:18:04 2008 @@ -24,7 +24,7 @@ ?> --EXPECTF-- unicode(1) "1" -unicode(5) "30719" +unicode(5) "32767" unicode(1) "0" unicode(1) "1" unicode(1) "0" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
janiTue Dec 9 15:20:58 2008 UTC
Modified files:
/php-srcrun-tests.php
Log:
- Use version id instead of defined() since latter does not work with magic
constants
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.383&r2=1.384&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.383 php-src/run-tests.php:1.384
--- php-src/run-tests.php:1.383 Mon Dec 8 12:36:38 2008
+++ php-src/run-tests.php Tue Dec 9 15:20:58 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.383 2008/12/08 12:36:38 jani Exp $ */
+/* $Id: run-tests.php,v 1.384 2008/12/09 15:20:58 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -59,8 +59,8 @@
exit;
}
-// If __DIR__ is not defined, define it
-if (!defined('__DIR__')) {
+// __DIR__ is available from 5.3.0
+if (PHP_VERSION_ID < 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
}
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.383 $' . "\n";
+ echo '$Revision: 1.384 $' . "\n";
exit(1);
default:
--
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) / run-tests.php
janiTue Dec 9 15:21:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.54&r2=1.226.2.37.2.35.2.55&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.54
php-src/run-tests.php:1.226.2.37.2.35.2.55
--- php-src/run-tests.php:1.226.2.37.2.35.2.54 Mon Dec 8 12:36:10 2008
+++ php-src/run-tests.php Tue Dec 9 15:21:15 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.54 2008/12/08 12:36:10 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.55 2008/12/09 15:21:15 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -59,8 +59,8 @@
exit;
}
-// If __DIR__ is not defined, define it
-if (!defined('__DIR__')) {
+// __DIR__ is available from 5.3.0
+if (PHP_VERSION_ID < 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
}
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.54
$' . "\n";
+ echo '$Revision: 1.226.2.37.2.35.2.55
$' . "\n";
exit(1);
default:
--
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) / run-tests.php
janiTue Dec 9 15:21:33 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.53&r2=1.226.2.37.2.54&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.53
php-src/run-tests.php:1.226.2.37.2.54
--- php-src/run-tests.php:1.226.2.37.2.53 Mon Dec 8 12:35:54 2008
+++ php-src/run-tests.php Tue Dec 9 15:21:33 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.53 2008/12/08 12:35:54 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.54 2008/12/09 15:21:33 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -59,8 +59,8 @@
exit;
}
-// If __DIR__ is not defined, define it
-if (!defined('__DIR__')) {
+// __DIR__ is available from 5.3.0
+if (PHP_VERSION_ID < 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
}
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.53 $' .
"\n";
+ echo '$Revision: 1.226.2.37.2.54 $' .
"\n";
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php-src(PHP_5_3) / run-tests.php
Johannes Schlüter wrote: On Tue, 2008-12-09 at 10:56 +0100, Hannes Magnusson wrote: defined() apparently doesn't work on magic constants (__LINE__, __METHOD__, __FILE__...). The docs don't mention this so I assume johannes found a bug he should report :) If there is a bug it's in the docs I'd say as get_defined_constants(), constant() and probably others don't know them either and I don't think it's good to add special handling to a these functions. I didn't know that's not in the docs so I didn't report but can do :-) I fixed run-tests.php to use version id instead like you suggested earlier. :) --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang short_tags.002.phpt short_tags.003.phpt
janiTue Dec 9 15:44:10 2008 UTC Modified files: /php-src/tests/lang short_tags.002.phpt short_tags.003.phpt Log: - Fix tests (apparently whoever wrote this crap never tested these properly) http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/short_tags.002.phpt diff -u php-src/tests/lang/short_tags.002.phpt:1.2 php-src/tests/lang/short_tags.002.phpt:1.3 --- php-src/tests/lang/short_tags.002.phpt:1.2 Fri Nov 28 10:42:20 2008 +++ php-src/tests/lang/short_tags.002.phpt Tue Dec 9 15:44:09 2008 @@ -1,12 +1,14 @@ --TEST-- short tags --INI-- -short_tags=off +short_open_tag=off --FILE-- Finished --EXPECT-- -Used a short tag + Finished http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.003.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/short_tags.003.phpt diff -u php-src/tests/lang/short_tags.003.phpt:1.2 php-src/tests/lang/short_tags.003.phpt:1.3 --- php-src/tests/lang/short_tags.003.phpt:1.2 Fri Nov 28 10:42:20 2008 +++ php-src/tests/lang/short_tags.003.phpt Tue Dec 9 15:44:09 2008 @@ -1,7 +1,7 @@ --TEST-- tags --INI-- -short_open_tags=on +short_open_tag=on asp_tags=on --FILE-- -- 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) /tests/lang short_tags.002.phpt short_tags.003.phpt
janiTue Dec 9 15:44:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/tests/lang short_tags.002.phpt short_tags.003.phpt Log: MFH: fix tests http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.002.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/tests/lang/short_tags.002.phpt diff -u php-src/tests/lang/short_tags.002.phpt:1.1.4.2 php-src/tests/lang/short_tags.002.phpt:1.1.4.3 --- php-src/tests/lang/short_tags.002.phpt:1.1.4.2 Fri Nov 28 10:41:19 2008 +++ php-src/tests/lang/short_tags.002.phpt Tue Dec 9 15:44:39 2008 @@ -1,12 +1,14 @@ --TEST-- short tags --INI-- -short_tags=off +short_open_tag=off --FILE-- Finished --EXPECT-- -Used a short tag + Finished http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.003.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/tests/lang/short_tags.003.phpt diff -u php-src/tests/lang/short_tags.003.phpt:1.1.4.2 php-src/tests/lang/short_tags.003.phpt:1.1.4.3 --- php-src/tests/lang/short_tags.003.phpt:1.1.4.2 Fri Nov 28 10:41:19 2008 +++ php-src/tests/lang/short_tags.003.phpt Tue Dec 9 15:44:39 2008 @@ -1,7 +1,7 @@ --TEST-- tags --INI-- -short_open_tags=on +short_open_tag=on asp_tags=on --FILE-- -- 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) /tests/lang short_tags.002.phpt short_tags.003.phpt
janiTue Dec 9 15:44:47 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/lang short_tags.002.phpt short_tags.003.phpt Log: MFH: fix tests http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.002.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/tests/lang/short_tags.002.phpt diff -u php-src/tests/lang/short_tags.002.phpt:1.1.2.1 php-src/tests/lang/short_tags.002.phpt:1.1.2.2 --- php-src/tests/lang/short_tags.002.phpt:1.1.2.1 Fri Nov 28 10:40:36 2008 +++ php-src/tests/lang/short_tags.002.phpt Tue Dec 9 15:44:47 2008 @@ -1,12 +1,14 @@ --TEST-- short tags --INI-- -short_tags=off +short_open_tag=off --FILE-- Finished --EXPECT-- -Used a short tag + Finished http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.003.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/tests/lang/short_tags.003.phpt diff -u php-src/tests/lang/short_tags.003.phpt:1.1.2.1 php-src/tests/lang/short_tags.003.phpt:1.1.2.2 --- php-src/tests/lang/short_tags.003.phpt:1.1.2.1 Fri Nov 28 10:40:36 2008 +++ php-src/tests/lang/short_tags.003.phpt Tue Dec 9 15:44:47 2008 @@ -1,7 +1,7 @@ --TEST-- tags --INI-- -short_open_tags=on +short_open_tag=on asp_tags=on --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang short_tags.001.phpt short_tags.002.phpt short_tags.003.phpt short_tags.004.phpt
janiTue Dec 9 16:05:33 2008 UTC Modified files: /php-src/tests/lang short_tags.001.phpt short_tags.002.phpt short_tags.003.phpt short_tags.004.phpt Log: - Better descriptions for these tests http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/short_tags.001.phpt diff -u php-src/tests/lang/short_tags.001.phpt:1.2 php-src/tests/lang/short_tags.001.phpt:1.3 --- php-src/tests/lang/short_tags.001.phpt:1.2 Fri Nov 28 10:42:20 2008 +++ php-src/tests/lang/short_tags.001.phpt Tue Dec 9 16:05:33 2008 @@ -1,5 +1,5 @@ --TEST-- -short tags +short_open_tag: On --INI-- short_open_tag=on --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.002.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/lang/short_tags.002.phpt diff -u php-src/tests/lang/short_tags.002.phpt:1.3 php-src/tests/lang/short_tags.002.phpt:1.4 --- php-src/tests/lang/short_tags.002.phpt:1.3 Tue Dec 9 15:44:09 2008 +++ php-src/tests/lang/short_tags.002.phpt Tue Dec 9 16:05:33 2008 @@ -1,5 +1,5 @@ --TEST-- -short tags +short_open_tag: Off --INI-- short_open_tag=off --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.003.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/lang/short_tags.003.phpt diff -u php-src/tests/lang/short_tags.003.phpt:1.3 php-src/tests/lang/short_tags.003.phpt:1.4 --- php-src/tests/lang/short_tags.003.phpt:1.3 Tue Dec 9 15:44:09 2008 +++ php-src/tests/lang/short_tags.003.phpt Tue Dec 9 16:05:33 2008 @@ -1,5 +1,5 @@ --TEST-- -tags +short_open_tag: On, asp_tags: On --INI-- short_open_tag=on asp_tags=on http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/short_tags.004.phpt diff -u php-src/tests/lang/short_tags.004.phpt:1.2 php-src/tests/lang/short_tags.004.phpt:1.3 --- php-src/tests/lang/short_tags.004.phpt:1.2 Fri Nov 28 10:42:20 2008 +++ php-src/tests/lang/short_tags.004.phpt Tue Dec 9 16:05:33 2008 @@ -1,5 +1,5 @@ --TEST-- -tags +short_open_tag: Off, asp_tags: Off --INI-- short_open_tag=off asp_tags=off @@ -34,4 +34,4 @@ -Notice: Undefined variable: b in %s on line %d \ No newline at end of file +Notice: Undefined variable: b in %s on line %d -- 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) /tests/lang short_tags.001.phpt short_tags.002.phpt short_tags.003.phpt short_tags.004.phpt
janiTue Dec 9 16:05:49 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/tests/lang short_tags.001.phpt short_tags.002.phpt short_tags.003.phpt short_tags.004.phpt Log: MFH:- Better descriptions for these tests http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.001.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/tests/lang/short_tags.001.phpt diff -u php-src/tests/lang/short_tags.001.phpt:1.1.4.2 php-src/tests/lang/short_tags.001.phpt:1.1.4.3 --- php-src/tests/lang/short_tags.001.phpt:1.1.4.2 Fri Nov 28 10:41:19 2008 +++ php-src/tests/lang/short_tags.001.phpt Tue Dec 9 16:05:49 2008 @@ -1,5 +1,5 @@ --TEST-- -short tags +short_open_tag: On --INI-- short_open_tag=on --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.002.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/tests/lang/short_tags.002.phpt diff -u php-src/tests/lang/short_tags.002.phpt:1.1.4.3 php-src/tests/lang/short_tags.002.phpt:1.1.4.4 --- php-src/tests/lang/short_tags.002.phpt:1.1.4.3 Tue Dec 9 15:44:39 2008 +++ php-src/tests/lang/short_tags.002.phpt Tue Dec 9 16:05:49 2008 @@ -1,5 +1,5 @@ --TEST-- -short tags +short_open_tag: Off --INI-- short_open_tag=off --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.003.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/tests/lang/short_tags.003.phpt diff -u php-src/tests/lang/short_tags.003.phpt:1.1.4.3 php-src/tests/lang/short_tags.003.phpt:1.1.4.4 --- php-src/tests/lang/short_tags.003.phpt:1.1.4.3 Tue Dec 9 15:44:39 2008 +++ php-src/tests/lang/short_tags.003.phpt Tue Dec 9 16:05:49 2008 @@ -1,5 +1,5 @@ --TEST-- -tags +short_open_tag: On, asp_tags: On --INI-- short_open_tag=on asp_tags=on http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.004.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/tests/lang/short_tags.004.phpt diff -u php-src/tests/lang/short_tags.004.phpt:1.1.4.2 php-src/tests/lang/short_tags.004.phpt:1.1.4.3 --- php-src/tests/lang/short_tags.004.phpt:1.1.4.2 Fri Nov 28 10:41:19 2008 +++ php-src/tests/lang/short_tags.004.phpt Tue Dec 9 16:05:49 2008 @@ -1,5 +1,5 @@ --TEST-- -tags +short_open_tag: Off, asp_tags: Off --INI-- short_open_tag=off asp_tags=off @@ -34,4 +34,4 @@ -Notice: Undefined variable: b in %s on line %d \ No newline at end of file +Notice: Undefined variable: b in %s on line %d -- 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) /tests/lang short_tags.001.phpt short_tags.002.phpt short_tags.003.phpt short_tags.004.phpt
janiTue Dec 9 16:05:57 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/lang short_tags.001.phpt short_tags.002.phpt short_tags.003.phpt short_tags.004.phpt Log: MFH http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.001.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/tests/lang/short_tags.001.phpt diff -u php-src/tests/lang/short_tags.001.phpt:1.1.2.1 php-src/tests/lang/short_tags.001.phpt:1.1.2.2 --- php-src/tests/lang/short_tags.001.phpt:1.1.2.1 Fri Nov 28 10:40:36 2008 +++ php-src/tests/lang/short_tags.001.phpt Tue Dec 9 16:05:57 2008 @@ -1,5 +1,5 @@ --TEST-- -short tags +short_open_tag: On --INI-- short_open_tag=on --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.002.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/tests/lang/short_tags.002.phpt diff -u php-src/tests/lang/short_tags.002.phpt:1.1.2.2 php-src/tests/lang/short_tags.002.phpt:1.1.2.3 --- php-src/tests/lang/short_tags.002.phpt:1.1.2.2 Tue Dec 9 15:44:47 2008 +++ php-src/tests/lang/short_tags.002.phpt Tue Dec 9 16:05:57 2008 @@ -1,5 +1,5 @@ --TEST-- -short tags +short_open_tag: Off --INI-- short_open_tag=off --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.003.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/tests/lang/short_tags.003.phpt diff -u php-src/tests/lang/short_tags.003.phpt:1.1.2.2 php-src/tests/lang/short_tags.003.phpt:1.1.2.3 --- php-src/tests/lang/short_tags.003.phpt:1.1.2.2 Tue Dec 9 15:44:47 2008 +++ php-src/tests/lang/short_tags.003.phpt Tue Dec 9 16:05:57 2008 @@ -1,5 +1,5 @@ --TEST-- -tags +short_open_tag: On, asp_tags: On --INI-- short_open_tag=on asp_tags=on http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.004.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/tests/lang/short_tags.004.phpt diff -u php-src/tests/lang/short_tags.004.phpt:1.1.2.1 php-src/tests/lang/short_tags.004.phpt:1.1.2.2 --- php-src/tests/lang/short_tags.004.phpt:1.1.2.1 Fri Nov 28 10:40:36 2008 +++ php-src/tests/lang/short_tags.004.phpt Tue Dec 9 16:05:57 2008 @@ -1,5 +1,5 @@ --TEST-- -tags +short_open_tag: Off, asp_tags: Off --INI-- short_open_tag=off asp_tags=off @@ -34,4 +34,4 @@ -Notice: Undefined variable: b in %s on line %d \ No newline at end of file +Notice: Undefined variable: b in %s on line %d -- 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/curl interface.c
iliaa Tue Dec 9 17:17:28 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl interface.c Log: Fixed missing initialization of uses when copying a curl handle http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.23&r2=1.62.2.14.2.27.2.24&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.23 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.24 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.23Thu Dec 4 13:13:22 2008 +++ php-src/ext/curl/interface.cTue Dec 9 17:17:27 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.23 2008/12/04 13:13:22 mkoppanen Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.24 2008/12/09 17:17:27 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -1273,6 +1273,7 @@ TSRMLS_SET_CTX(dupch->thread_ctx); dupch->cp = cp; + dupch->uses = 0; dupch->handlers->write->method = ch->handlers->write->method; dupch->handlers->write->type = ch->handlers->write->type; dupch->handlers->read->method = ch->handlers->read->method; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
iliaa Tue Dec 9 17:17:49 2008 UTC Modified files: /php-src/ext/curl interface.c Log: MFB: Fixed missing initialization of uses when copying a curl handle http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.137&r2=1.138&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.137 php-src/ext/curl/interface.c:1.138 --- php-src/ext/curl/interface.c:1.137 Thu Dec 4 13:12:49 2008 +++ php-src/ext/curl/interface.cTue Dec 9 17:17:49 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.137 2008/12/04 13:12:49 mkoppanen Exp $ */ +/* $Id: interface.c,v 1.138 2008/12/09 17:17:49 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -1283,6 +1283,7 @@ TSRMLS_SET_CTX(dupch->thread_ctx); dupch->cp = cp; + dupch->uses = 0; dupch->handlers->write->method = ch->handlers->write->method; dupch->handlers->write->type = ch->handlers->write->type; dupch->handlers->read->method = ch->handlers->read->method; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_element.c xmlrpc.c
iliaa Tue Dec 9 17:20:57 2008 UTC
Modified files:
/php-src/ext/xmlrpc/libxmlrpc xml_element.c xmlrpc.c
Log:
Comment out fprintf() use inside the library
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.11
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.12
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.11 Mon Jan 1 09:29:33 2007
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c Tue Dec 9 17:20:57 2008
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.11 2007/01/01
09:29:33 sebastian Exp $";
+static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.12 2008/12/09
17:20:57 iliaa Exp $";
@@ -44,6 +44,9 @@
* 06/2000
* HISTORY
* $Log: xml_element.c,v $
+ * Revision 1.12 2008/12/09 17:20:57 iliaa
+ * Comment out fprintf() use inside the library
+ *
* Revision 1.11 2007/01/01 09:29:33 sebastian
* Bump year.
*
@@ -381,7 +384,7 @@
depth++;
if(!el) {
- fprintf(stderr, "Nothing to write\n");
+ /* fprintf(stderr, "Nothing to write\n"); */
return;
}
if(!options) {
@@ -728,7 +731,7 @@
byte_idx > 10 ? 10 : byte_idx,
in_buf + (byte_idx > 10 ? byte_idx - 10 : byte_idx));
}
-
+/*
fprintf(stderr, "expat reports error code %i\n"
"\tdescription: %s\n"
"\tline: %i\n"
@@ -737,7 +740,7 @@
"\ttotal bytes: %i\n%s ",
err_code, error_str, line_num,
col_num, byte_idx, byte_total, buf);
-
+*/
/* error condition */
if(error) {
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.13
php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.14
--- php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.13 Wed Sep 10 00:05:26 2008
+++ php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c Tue Dec 9 17:20:57 2008
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.13 2008/09/10 00:05:26
felipe Exp $";
+static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.14 2008/12/09 17:20:57
iliaa Exp $";
/h* ABOUT/xmlrpc
@@ -43,6 +43,9 @@
* 9/1999 - 10/2000
* HISTORY
* $Log: xmlrpc.c,v $
+ * Revision 1.14 2008/12/09 17:20:57 iliaa
+ * Comment out fprintf() use inside the library
+ *
* Revision 1.13 2008/09/10 00:05:26 felipe
* - Merged fix from SF project (Import Jeff Lawsons patches for XML
datetime bug fixes)
* Fixed bugs:
@@ -1170,13 +1173,13 @@
}
}
else {
- fprintf (stderr,
- "xmlrpc:
attempted to add key/val pair to vector of type array\n");
+ /* fprintf (stderr,
+ "xmlrpc:
attempted to add key/val pair to vector of type array\n"); */
}
break;
default:
- fprintf (stderr,
- "xmlrpc: attempted to
add value of unknown type to vector\n");
+ /* fprintf (stderr,
+ "xmlrpc: attempted to
add value of unknown type to vector\n"); */
break;
}
}
@@ -1506,8 +1509,8 @@
my_free(value);
break;
default:
- fprintf (stderr,
- "xmlrpc: attempted to
free value of invalid type\n");
+ /* fprintf (stderr,
+ "xmlrpc: attempted to
free value of invalid type\n"); */
break;
}
}
--
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) / NEWS /ext/xmlrpc/libxmlrpc xml_element.c xmlrpc.c
iliaa Tue Dec 9 17:22:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/xmlrpc/libxmlrpc xml_element.c xmlrpc.c
Log:
MFH: Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable error
when given bad data).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.408&r2=1.2027.2.547.2.965.2.409&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.408
php-src/NEWS:1.2027.2.547.2.965.2.409
--- php-src/NEWS:1.2027.2.547.2.965.2.408 Tue Dec 9 14:03:57 2008
+++ php-src/NEWSTue Dec 9 17:22:12 2008
@@ -8,6 +8,8 @@
session_is_registered(). (Hannes)
- Fixed bug #46811 (ini_set() doesn't return false on failure). (Hannes)
+- Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable error when
+ given bad data). (Ilia)
04 Dec 2008, PHP 5.3.0 Alpha 3
- Upgraded bundled PCRE to version 7.8. (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.9.4.1&r2=1.9.4.1.2.1&diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9.4.1
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9.4.1.2.1
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9.4.1 Sun Jul 30 11:34:02 2006
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c Tue Dec 9 17:22:12 2008
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.9.4.1 2006/07/30
11:34:02 tony2001 Exp $";
+static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.9.4.1.2.1 2008/12/09
17:22:12 iliaa Exp $";
@@ -44,6 +44,11 @@
* 06/2000
* HISTORY
* $Log: xml_element.c,v $
+ * Revision 1.9.4.1.2.1 2008/12/09 17:22:12 iliaa
+ *
+ * MFH: Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable
error
+ * when given bad data).
+ *
* Revision 1.9.4.1 2006/07/30 11:34:02 tony2001
* MFH: fix compile warnings (#38257)
*
@@ -378,7 +383,7 @@
depth++;
if(!el) {
- fprintf(stderr, "Nothing to write\n");
+ /* fprintf(stderr, "Nothing to write\n"); */
return;
}
if(!options) {
@@ -725,7 +730,7 @@
byte_idx > 10 ? 10 : byte_idx,
in_buf + (byte_idx > 10 ? byte_idx - 10 : byte_idx));
}
-
+/*
fprintf(stderr, "expat reports error code %i\n"
"\tdescription: %s\n"
"\tline: %i\n"
@@ -734,7 +739,7 @@
"\ttotal bytes: %i\n%s ",
err_code, error_str, line_num,
col_num, byte_idx, byte_total, buf);
-
+*/
/* error condition */
if(error) {
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c?r1=1.8.4.3.2.1&r2=1.8.4.3.2.2&diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8.4.3.2.1
php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8.4.3.2.2
--- php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8.4.3.2.1 Wed Sep 10 00:07:44 2008
+++ php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c Tue Dec 9 17:22:12 2008
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.8.4.3.2.1 2008/09/10
00:07:44 felipe Exp $";
+static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.8.4.3.2.2 2008/12/09
17:22:12 iliaa Exp $";
/h* ABOUT/xmlrpc
@@ -43,6 +43,11 @@
* 9/1999 - 10/2000
* HISTORY
* $Log: xmlrpc.c,v $
+ * Revision 1.8.4.3.2.2 2008/12/09 17:22:12 iliaa
+ *
+ * MFH: Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable
error
+ * when given bad data).
+ *
* Revision 1.8.4.3.2.1 2008/09/10 00:07:44 felipe
* MFH:
* - Merged fix from SF project (Import Jeff Lawsons patches for XML
datetime bug fixes)
@@ -1168,13 +1173,13 @@
}
}
else {
- fprintf (stderr,
- "xmlrpc:
attempted to add key/val pair to vector of type array\n");
+ /* fprintf (stderr,
+ "xmlrpc:
attempted to add key/val pair to vector of type array\n"); */
}
break;
default:
- fprintf (stderr,
- "xmlrpc: attempted to
add value of unknown type to vector\n");
+ /* fprintf (stderr,
+ "xmlrpc: attempted to
add value of unknown type to vector\n"); */
break;
}
}
@@ -1504,8 +1509,8 @@
my_free(value);
break;
default:
- fprintf (stderr,
- "xmlrpc: attempted to
free value of invalid type\n");
+ /* fprintf (stder
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c winver.h
pajoye Tue Dec 9 17:54:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c winver.h
Log:
- fix VC6 build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.14&r2=1.249.2.10.2.14.2.15&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.14
php-src/ext/standard/info.c:1.249.2.10.2.14.2.15
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.14Mon Dec 8 07:32:14 2008
+++ php-src/ext/standard/info.c Tue Dec 9 17:54:01 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.14 2008/12/08 07:32:14 stas Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.15 2008/12/09 17:54:01 pajoye Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -38,6 +38,18 @@
#include
#endif
+#ifdef PHP_WIN32
+typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
+
+# include "winver.h"
+
+#if _MSC_VER < 1300
+# define OSVERSIONINFOEX php_win_OSVERSIONINFOEX
+#endif
+
+#endif
+
#if HAVE_MBSTRING
#include "ext/mbstring/mbstring.h"
ZEND_EXTERN_MODULE_GLOBALS(mbstring)
@@ -343,9 +355,9 @@
if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2 )
{
if (GetSystemMetrics(SM_SERVERR2))
major = "Windows Server 2003 R2";
- else if (osvi.wSuiteMask==VER_SUITE_STORAGE_SERVER)
+ else if (osvi.wSuiteMask == VER_SUITE_STORAGE_SERVER)
major = "Windows Storage Server 2003";
- else if (osvi.wSuiteMask==VER_SUITE_WH_SERVER)
+ else if (osvi.wSuiteMask == VER_SUITE_WH_SERVER)
major = "Windows Home Server";
else if (osvi.wProductType == VER_NT_WORKSTATION &&
si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/winver.h?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/winver.h
diff -u php-src/ext/standard/winver.h:1.1.2.1
php-src/ext/standard/winver.h:1.1.2.2
--- php-src/ext/standard/winver.h:1.1.2.1 Mon Dec 8 07:32:14 2008
+++ php-src/ext/standard/winver.h Tue Dec 9 17:54:01 2008
@@ -57,10 +57,20 @@
#define VER_SUITE_BLADE 0x0400
#define VER_SUITE_EMBEDDED_RESTRICTED 0x0800
#define VER_SUITE_SECURITY_APPLIANCE0x1000
-#define VER_SUITE_STORAGE_SERVER0x2000
-#define VER_SUITE_COMPUTE_SERVER0x4000
#endif
+#ifndef VER_SUITE_STORAGE_SERVER
+# define VER_SUITE_STORAGE_SERVER0x2000
+#endif
+
+#ifndef VER_SUITE_COMPUTE_SERVER
+# define VER_SUITE_COMPUTE_SERVER0x4000
+#endif
+/*
+ext\standard\info.c(346) : error C2065: 'VER_SUITE_STORAGE_SERVER' :
undeclared identifier
+ext\standard\info.c(373) : error C2065: 'VER_SUITE_COMPUTE_SERVER' :
undeclared identifier
+*/
+
#ifndef PROCESSOR_ARCHITECTURE_AMD64
#define PROCESSOR_ARCHITECTURE_AMD649
#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/standard info.c winver.h
pajoye Tue Dec 9 17:58:00 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c winver.h
Log:
- double declaration and comments cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.15&r2=1.249.2.10.2.14.2.16&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.15
php-src/ext/standard/info.c:1.249.2.10.2.14.2.16
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.15Tue Dec 9 17:54:01 2008
+++ php-src/ext/standard/info.c Tue Dec 9 17:57:59 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.15 2008/12/09 17:54:01 pajoye Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.16 2008/12/09 17:57:59 pajoye Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -252,15 +252,6 @@
#ifdef PHP_WIN32
/* {{{ */
-typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
-typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
-
-#include "winver.h"
-
-#if _MSC_VER < 1300
-#define OSVERSIONINFOEX php_win_OSVERSIONINFOEX
-#endif
-
char* php_get_windows_name()
{
OSVERSIONINFOEX osvi;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/winver.h?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/winver.h
diff -u php-src/ext/standard/winver.h:1.1.2.2
php-src/ext/standard/winver.h:1.1.2.3
--- php-src/ext/standard/winver.h:1.1.2.2 Tue Dec 9 17:54:01 2008
+++ php-src/ext/standard/winver.h Tue Dec 9 17:57:59 2008
@@ -66,10 +66,6 @@
#ifndef VER_SUITE_COMPUTE_SERVER
# define VER_SUITE_COMPUTE_SERVER0x4000
#endif
-/*
-ext\standard\info.c(346) : error C2065: 'VER_SUITE_STORAGE_SERVER' :
undeclared identifier
-ext\standard\info.c(373) : error C2065: 'VER_SUITE_COMPUTE_SERVER' :
undeclared identifier
-*/
#ifndef PROCESSOR_ARCHITECTURE_AMD64
#define PROCESSOR_ARCHITECTURE_AMD649
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Tue Dec 9 18:46:12 2008 UTC Modified files: /CVSROOTavail Log: - phpdoc karma for Rhoda (DeDe) Morton (dedemorton) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1475&r2=1.1476&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1475 CVSROOT/avail:1.1476 --- CVSROOT/avail:1.1475Sun Dec 7 15:59:56 2008 +++ CVSROOT/avail Tue Dec 9 18:46:11 2008 @@ -41,7 +41,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,danbeck,sli,jmcastagnetto,mohrt,samesch,soneca,ronabop,glace,latoserver,rafael,jcmeloni,chrullrich,mk,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zimt,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,cos! tra,fancao0515,tibee,eriksson,wenz,bs,anderson,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingf! s,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,um ut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,! eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,tessus,gavinfo,rant,ramsey,arkadius,erinet,omar,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,asbjornit,philippe,sezer,rmlr,hradtke,alan,danielc,danbrown,alexxed,psalehpoor,loudi,abedford,morgue,nilgun,saltybeagle|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdo! c-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdo c-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|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschu
[PHP-CVS] Re: cvs: php-src(PHP_5_3) /ext/phar/tests ini_set.phpt
Hannes Magnusson wrote: > bjori Tue Dec 9 13:02:40 2008 UTC > > Modified files: (Branch: PHP_5_3) > /php-src/ext/phar/tests ini_set.phpt > Log: > MFH: fix test > > > http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/ini_set.phpt?r1=1.4.2.1&r2=1.4.2.2&diff_format=u > Index: php-src/ext/phar/tests/ini_set.phpt > diff -u php-src/ext/phar/tests/ini_set.phpt:1.4.2.1 > php-src/ext/phar/tests/ini_set.phpt:1.4.2.2 > --- php-src/ext/phar/tests/ini_set.phpt:1.4.2.1 Fri Aug 1 13:38:47 2008 > +++ php-src/ext/phar/tests/ini_set.phpt Tue Dec 9 13:02:40 2008 > @@ -25,7 +25,7 @@ > string(1) "1" > string(1) "1" > string(1) "1" > -string(1) "1" > -string(1) "1" > +bool(false) > +bool(false) > string(1) "1" > string(1) "1" Hi, Heads up: there have been several commits to ext/phar in php-src by non-maintainers who did not merge to pecl/phar, and a couple to pecl/phar that were not merged to php-src. You have 2 choices. 1) merge that sucker 2) email all of the phar maintainers whenever you do a commit so we at least know about it and can do the merge. php-src/phar HEAD/PHP_5_3 and pecl/phar are intended to be 100% in sync. Thanks, Greg -- 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) /main php_compat.h
nlopess Tue Dec 9 22:00:20 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/main php_compat.h Log: update PCRE symbol list (sync with php 5.3). this should fix bug #46800 http://cvs.php.net/viewvc.cgi/php-src/main/php_compat.h?r1=1.25.2.3.2.5&r2=1.25.2.3.2.6&diff_format=u Index: php-src/main/php_compat.h diff -u php-src/main/php_compat.h:1.25.2.3.2.5 php-src/main/php_compat.h:1.25.2.3.2.6 --- php-src/main/php_compat.h:1.25.2.3.2.5 Mon Dec 31 07:20:15 2007 +++ php-src/main/php_compat.h Tue Dec 9 22:00:19 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_compat.h,v 1.25.2.3.2.5 2007/12/31 07:20:15 sebastian Exp $ */ +/* $Id: php_compat.h,v 1.25.2.3.2.6 2008/12/09 22:00:19 nlopess Exp $ */ #ifndef PHP_COMPAT_H #define PHP_COMPAT_H @@ -28,36 +28,34 @@ #endif #if defined(HAVE_BUNDLED_PCRE) || !defined(PHP_VERSION) -#define pcre_compile php_pcre_compile -#define pcre_compile2 php_pcre_compile2 +#define pcre_compile php_pcre_compile +#define pcre_compile2 php_pcre_compile2 #define pcre_copy_substringphp_pcre_copy_substring -#define pcre_exec php_pcre_exec +#define pcre_exec php_pcre_exec #define pcre_get_substring php_pcre_get_substring -#define pcre_get_substring_listphp_pcre_get_substring_list -#define pcre_info php_pcre_info +#define pcre_get_substring_listphp_pcre_get_substring_list +#define pcre_info php_pcre_info #define pcre_maketablesphp_pcre_maketables -#define pcre_study php_pcre_study +#define pcre_study php_pcre_study #define pcre_version php_pcre_version #define pcre_fullinfo php_pcre_fullinfo -#define pcre_free php_pcre_free -#define pcre_mallocphp_pcre_malloc -#define pcre_configphp_pcre_config -#define pcre_copy_named_substring php_pcre_copy_named_substring -#define pcre_free_substringphp_pcre_free_substring -#define pcre_free_substring_list php_pcre_free_substring_list -#define pcre_get_named_substring php_pcre_get_named_substring -#define pcre_get_stringnumber php_pcre_get_stringnumber -#define pcre_refcount php_pcre_refcount -#define _pcre_ord2utf8 php__pcre_ord2utf8 -#define _pcre_try_flipped php__pcre_try_flipped -#define _pcre_ucp_findprop php__pcre_ucp_findprop -#define _pcre_ucp_othercasephp__pcre_ucp_othercase -#define _pcre_valid_utf8 php__pcre_valid_utf8 -#define _pcre_xclass php__pcre_xclass +#define pcre_free php_pcre_free +#define pcre_mallocphp_pcre_malloc +#define pcre_configphp_pcre_config +#define pcre_copy_named_substring php_pcre_copy_named_substring +#define pcre_free_substringphp_pcre_free_substring +#define pcre_free_substring_list php_pcre_free_substring_list +#define pcre_get_named_substring php_pcre_get_named_substring +#define pcre_get_stringnumber php_pcre_get_stringnumber +#define pcre_refcount php_pcre_refcount +#define _pcre_ord2utf8 php__pcre_ord2utf8 +#define _pcre_try_flipped php__pcre_try_flipped +#define _pcre_valid_utf8 php__pcre_valid_utf8 +#define _pcre_xclass php__pcre_xclass #define pcre_callout php_pcre_callout #define _pcre_OP_lengths php__pcre_OP_lengths -/* this one doesn't work because pcre.h isn't included from the pcre_chartables.c file -#define _pcre_default_tables php__pcre_default_tables */ +#define _pcre_utt_namesphp__pcre_utt_names +#define _pcre_default_tables php__pcre_default_tables #define pcre_get_stringtable_entries php_pcre_get_stringtable_entries #define _pcre_is_newline php__pcre_is_newline #define pcre_stack_freephp_pcre_stack_free @@ -70,6 +68,10 @@ #define _pcre_utt php__pcre_utt #define _pcre_utt_size php__pcre_utt_size #define _pcre_was_newline php__pcre_was_newline +#define _pcre_ucd_records php__pcre_ucd_records +#define _pcre_ucd_stage1 php__pcre_ucd_stage1 +#define _pcre_ucd_stage2 php__pcre_ucd_stage2 +#define _pcre_ucp_gentype php__pcre_ucp_gentype #endif #define lookup php_lookup -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug45392.phpt
lbarnaudTue Dec 9 22:53:25 2008 UTC Modified files: /php-src/tests/lang bug45392.phpt Log: fixed test http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug45392.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/lang/bug45392.phpt diff -u php-src/tests/lang/bug45392.phpt:1.1 php-src/tests/lang/bug45392.phpt:1.2 --- php-src/tests/lang/bug45392.phpt:1.1Mon Aug 18 04:07:54 2008 +++ php-src/tests/lang/bug45392.phptTue Dec 9 22:53:25 2008 @@ -19,4 +19,3 @@ --EXPECTF-- 2 Fatal error: Allowed memory size of %d bytes exhausted%s -5 -- 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) /tests/lang bug45392.phpt
lbarnaudTue Dec 9 22:53:42 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/tests/lang bug45392.phpt Log: MFH: fixed test http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug45392.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/tests/lang/bug45392.phpt diff -u php-src/tests/lang/bug45392.phpt:1.1.2.2 php-src/tests/lang/bug45392.phpt:1.1.2.3 --- php-src/tests/lang/bug45392.phpt:1.1.2.2Mon Aug 18 04:08:17 2008 +++ php-src/tests/lang/bug45392.phptTue Dec 9 22:53:42 2008 @@ -19,4 +19,3 @@ --EXPECTF-- 2 Fatal error: Allowed memory size of %d bytes exhausted%s -5 -- 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) /tests/lang bug45392.phpt
lbarnaudTue Dec 9 22:54:16 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/lang bug45392.phpt Log: MFH: fixed test http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug45392.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/tests/lang/bug45392.phpt diff -u php-src/tests/lang/bug45392.phpt:1.1.4.2 php-src/tests/lang/bug45392.phpt:1.1.4.3 --- php-src/tests/lang/bug45392.phpt:1.1.4.2Mon Aug 18 04:09:38 2008 +++ php-src/tests/lang/bug45392.phptTue Dec 9 22:54:16 2008 @@ -19,4 +19,3 @@ --EXPECTF-- 2 Fatal error: Allowed memory size of %d bytes exhausted%s -5 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
