[PHP-CVS] cvs: php-src /ext/phar phar_object.c /ext/phar/tests config.xml front.phar.phpt /ext/phar/tests/files blog.phar
cellog Sun May 18 23:41:17 2008 UTC
Modified files:
/php-src/ext/phar phar_object.c
/php-src/ext/phar/tests config.xml front.phar.phpt
/php-src/ext/phar/tests/files blog.phar
Log:
MFH fix mem leak, add test for previous segfault fix
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.272&r2=1.273&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.272
php-src/ext/phar/phar_object.c:1.273
--- php-src/ext/phar/phar_object.c:1.272Sun May 18 23:12:47 2008
+++ php-src/ext/phar/phar_object.c Sun May 18 23:41:17 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.272 2008/05/18 23:12:47 cellog Exp $ */
+/* $Id: phar_object.c,v 1.273 2008/05/18 23:41:17 cellog Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -555,16 +555,18 @@
testit = sapi_getenv("SCRIPT_NAME", sizeof("SCRIPT_NAME")-1
TSRMLS_CC);
if (!(pt = strstr(testit, basename))) {
+ efree(testit);
return;
}
path_info = sapi_getenv("PATH_INFO", sizeof("PATH_INFO")-1
TSRMLS_CC);
if (path_info) {
- entry = estrdup(path_info);
+ entry = path_info;
entry_len = strlen(entry);
spprintf(&path_info, 0, "%s%s", testit, path_info);
free_pathinfo = 1;
} else {
path_info = testit;
+ free_pathinfo = 1;
entry = estrndup("", 0);
entry_len = 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/config.xml?r1=1.1&r2=1.2&diff_format=u
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/front.phar.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/front.phar.phpt
diff -u /dev/null php-src/ext/phar/tests/front.phar.phpt:1.2
--- /dev/null Sun May 18 23:41:17 2008
+++ php-src/ext/phar/tests/front.phar.phpt Sun May 18 23:41:17 2008
@@ -0,0 +1,16 @@
+--TEST--
+Phar front controller with mounted external file
+--INI--
+default_charset=
+--SKIPIF--
+
+--ENV--
+SCRIPT_NAME=/front.phar.php
+REQUEST_URI=/front.phar.php/index.php
+PATH_INFO=/index.php
+--EXPECTHEADERS--
+Content-type: text/html
+--FILE_EXTERNAL--
+files/blog.phar
+--EXPECT--
+string(0) ""
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/phar/tests/files/blog.phar
--
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 cgidebug phar_object.c /ext/phar/tests config.xml front.phar.phpt /ext/phar/tests/files blog.phar
cellog Sun May 18 23:41:08 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/phar/tests config.xml front.phar.phpt
/php-src/ext/phar/tests/files blog.phar
Modified files:
/php-src/ext/phar cgidebug phar_object.c
Log:
fix memleak, add test for previous segfault fix
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/cgidebug?r1=1.3&r2=1.3.2.1&diff_format=u
Index: php-src/ext/phar/cgidebug
diff -u php-src/ext/phar/cgidebug:1.3 php-src/ext/phar/cgidebug:1.3.2.1
--- php-src/ext/phar/cgidebug:1.3 Thu May 8 00:49:36 2008
+++ php-src/ext/phar/cgidebug Sun May 18 23:41:08 2008
@@ -1,11 +1,11 @@
#!/bin/sh
-export SCRIPT_NAME=/frontcontroller34.php
-export PATH_INFO=/start/index.php
-export
SCRIPT_FILENAME=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller34.php
-export
PATH_TRANSLATED=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller34.php
+export SCRIPT_NAME=/front.phar.php
+export PATH_INFO=/index.php
+export
SCRIPT_FILENAME=/home/cellog/workspace/php5/ext/phar/tests/front.phar.php
+export
PATH_TRANSLATED=/home/cellog/workspace/php5/ext/phar/tests/front.phar.php
export REDIRECT_STATUS=1
export REQUEST_METHOD=GET
-export REQUEST_URI=/frontcontroller34.php/start/index.php
+export REQUEST_URI=/front.phar.php/index.php
cd /home/cellog/workspace/php5/
ddd sapi/cgi/php-cgi &
cd /home/cellog/workspace/php5/ext/phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.5&r2=1.266.2.6&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.5
php-src/ext/phar/phar_object.c:1.266.2.6
--- php-src/ext/phar/phar_object.c:1.266.2.5Sun May 18 23:11:24 2008
+++ php-src/ext/phar/phar_object.c Sun May 18 23:41:08 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.266.2.5 2008/05/18 23:11:24 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.6 2008/05/18 23:41:08 cellog Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -555,16 +555,18 @@
testit = sapi_getenv("SCRIPT_NAME", sizeof("SCRIPT_NAME")-1
TSRMLS_CC);
if (!(pt = strstr(testit, basename))) {
+ efree(testit);
return;
}
path_info = sapi_getenv("PATH_INFO", sizeof("PATH_INFO")-1
TSRMLS_CC);
if (path_info) {
- entry = estrdup(path_info);
+ entry = path_info;
entry_len = strlen(entry);
spprintf(&path_info, 0, "%s%s", testit, path_info);
free_pathinfo = 1;
} else {
path_info = testit;
+ free_pathinfo = 1;
entry = estrndup("", 0);
entry_len = 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/config.xml?view=markup&rev=1.1
Index: php-src/ext/phar/tests/config.xml
+++ php-src/ext/phar/tests/config.xml
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/front.phar.phpt?view=markup&rev=1.1
Index: php-src/ext/phar/tests/front.phar.phpt
+++ php-src/ext/phar/tests/front.phar.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar?view=markup&rev=1.1
Index: php-src/ext/phar/tests/files/blog.phar
+++ php-src/ext/phar/tests/files/blog.phar
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar cgidebug phar_object.c
cellog Sun May 18 23:12:47 2008 UTC
Modified files:
/php-src/ext/phar cgidebug phar_object.c
Log:
MFB fix segfault
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/cgidebug?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/phar/cgidebug
diff -u php-src/ext/phar/cgidebug:1.3 php-src/ext/phar/cgidebug:1.4
--- php-src/ext/phar/cgidebug:1.3 Thu May 8 00:49:36 2008
+++ php-src/ext/phar/cgidebug Sun May 18 23:12:47 2008
@@ -1,11 +1,11 @@
#!/bin/sh
-export SCRIPT_NAME=/frontcontroller34.php
-export PATH_INFO=/start/index.php
-export
SCRIPT_FILENAME=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller34.php
-export
PATH_TRANSLATED=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller34.php
+export SCRIPT_NAME=/front.phar.php
+export PATH_INFO=
+export
SCRIPT_FILENAME=/home/cellog/workspace/php5/ext/phar/tests/front.phar.php
+export
PATH_TRANSLATED=/home/cellog/workspace/php5/ext/phar/tests/front.phar.php
export REDIRECT_STATUS=1
export REQUEST_METHOD=GET
-export REQUEST_URI=/frontcontroller34.php/start/index.php
+export REQUEST_URI=/front.phar.php
cd /home/cellog/workspace/php5/
ddd sapi/cgi/php-cgi &
cd /home/cellog/workspace/php5/ext/phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.271&r2=1.272&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.271
php-src/ext/phar/phar_object.c:1.272
--- php-src/ext/phar/phar_object.c:1.271Sat May 17 20:07:38 2008
+++ php-src/ext/phar/phar_object.c Sun May 18 23:12:47 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.271 2008/05/17 20:07:38 cellog Exp $ */
+/* $Id: phar_object.c,v 1.272 2008/05/18 23:12:47 cellog Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -445,7 +445,7 @@
*/
PHP_METHOD(Phar, mount)
{
- char *fname, *arch, *entry, *path, *actual;
+ char *fname, *arch = NULL, *entry = NULL, *path, *actual;
int fname_len, arch_len, entry_len, path_len, actual_len;
phar_archive_data **pphar;
@@ -467,7 +467,9 @@
carry_on2:
if (SUCCESS != zend_hash_find(&(PHAR_GLOBALS->phar_fname_map),
arch, arch_len, (void **)&pphar)) {
zend_throw_exception_ex(phar_ce_PharException, 0
TSRMLS_CC, "%s is not a phar archive, cannot mount", arch);
- efree(arch);
+ if (arch) {
+ efree(arch);
+ }
return;
}
carry_on:
@@ -476,13 +478,17 @@
if (path && path == entry) {
efree(entry);
}
- efree(arch);
+ if (arch) {
+ efree(arch);
+ }
return;
}
- if (path && path == entry) {
+ if (entry && path && path == entry) {
efree(entry);
}
- efree(arch);
+ if (arch) {
+ efree(arch);
+ }
return;
} else if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map),
fname, fname_len, (void **)&pphar)) {
goto carry_on;
--
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 phar_object.c
cellog Sun May 18 23:11:24 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar_object.c
Log:
fix segfault, test coming shortly
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.4&r2=1.266.2.5&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.4
php-src/ext/phar/phar_object.c:1.266.2.5
--- php-src/ext/phar/phar_object.c:1.266.2.4Sat May 17 20:07:22 2008
+++ php-src/ext/phar/phar_object.c Sun May 18 23:11:24 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.266.2.4 2008/05/17 20:07:22 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.5 2008/05/18 23:11:24 cellog Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -445,7 +445,7 @@
*/
PHP_METHOD(Phar, mount)
{
- char *fname, *arch, *entry, *path, *actual;
+ char *fname, *arch = NULL, *entry = NULL, *path, *actual;
int fname_len, arch_len, entry_len, path_len, actual_len;
phar_archive_data **pphar;
@@ -467,7 +467,9 @@
carry_on2:
if (SUCCESS != zend_hash_find(&(PHAR_GLOBALS->phar_fname_map),
arch, arch_len, (void **)&pphar)) {
zend_throw_exception_ex(phar_ce_PharException, 0
TSRMLS_CC, "%s is not a phar archive, cannot mount", arch);
- efree(arch);
+ if (arch) {
+ efree(arch);
+ }
return;
}
carry_on:
@@ -476,13 +478,17 @@
if (path && path == entry) {
efree(entry);
}
- efree(arch);
+ if (arch) {
+ efree(arch);
+ }
return;
}
- if (path && path == entry) {
+ if (entry && path && path == entry) {
efree(entry);
}
- efree(arch);
+ if (arch) {
+ efree(arch);
+ }
return;
} else if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map),
fname, fname_len, (void **)&pphar)) {
goto carry_on;
--
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 basic_functions.c
felipe Sun May 18 22:32:34 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
Log:
- Reverted the accidental previous commit
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.72&r2=1.725.2.31.2.73&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.72
php-src/ext/standard/basic_functions.c:1.725.2.31.2.73
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.72 Sun May 18
21:50:58 2008
+++ php-src/ext/standard/basic_functions.c Sun May 18 22:32:33 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.73 2008/05/18 22:32:33 felipe Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3859,17 +3859,9 @@
SetEnvironmentVariable(pe->key, "bugbug");
#endif
putenv(pe->previous_value);
-<<< basic_functions.c
-#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
-===
# if defined(PHP_WIN32)
->>> 1.725.2.31.2.71
efree(pe->previous_value);
-<<< basic_functions.c
-#endif
-===
# endif
->>> 1.725.2.31.2.71
} else {
# if HAVE_UNSETENV
unsetenv(pe->key);
@@ -4469,13 +4461,8 @@
pe.previous_value = NULL;
for (env = environ; env != NULL && *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len) &&
(*env)[pe.key_len] == '=') { /* found it */
-<<< basic_functions.c
-#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
- /* must copy previous value because putenv can
free the string without notice */
-===
#if defined(PHP_WIN32)
/* must copy previous value because MSVCRT's
putenv can free the string without notice */
->>> 1.725.2.31.2.71
pe.previous_value = estrdup(*env);
#else
pe.previous_value = *env;
--
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/standard array.c basic_functions.c
Em Seg, 2008-05-19 às 00:16 +0200, Hannes Magnusson escreveu:
> On Sun, May 18, 2008 at 11:50 PM, Felipe Pena <[EMAIL PROTECTED]> wrote:
> > felipe Sun May 18 21:50:58 2008 UTC
> >
> > Modified files: (Branch: PHP_5_2)
> >/php-src/ext/standard array.c basic_functions.c
> > Log:
> > - MFB: Making compatible with 64bit platform
> > http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.71&r2=1.725.2.31.2.72&diff_format=u
> > Index: php-src/ext/standard/basic_functions.c
> > diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.71
> > php-src/ext/standard/basic_functions.c:1.725.2.31.2.72
> > --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.71 Mon May 12
> > 08:47:29 2008
> > +++ php-src/ext/standard/basic_functions.c Sun May 18 21:50:58 2008
> > @@ -17,7 +17,7 @@
> >+--+
> > */
> >
> > -/* $Id: basic_functions.c,v 1.725.2.31.2.71 2008/05/12 08:47:29 tony2001
> > Exp $ */
> > +/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp
> > $ */
> >
> > #include "php.h"
> > #include "php_streams.h"
> > @@ -3859,9 +3859,17 @@
> >SetEnvironmentVariable(pe->key, "bugbug");
> > #endif
> >putenv(pe->previous_value);
> > +<<< basic_functions.c
> > +#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
> > +===
> > # if defined(PHP_WIN32)
> > +>>> 1.725.2.31.2.71
> >efree(pe->previous_value);
> > +<<< basic_functions.c
> > +#endif
> > +===
> > # endif
> > +>>> 1.725.2.31.2.71
> >} else {
> > # if HAVE_UNSETENV
> >unsetenv(pe->key);
> > @@ -4461,8 +4469,13 @@
> >pe.previous_value = NULL;
> >for (env = environ; env != NULL && *env != NULL; env++) {
> >if (!strncmp(*env, pe.key, pe.key_len) &&
> > (*env)[pe.key_len] == '=') { /* found it */
> > +<<< basic_functions.c
> > +#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
> > + /* must copy previous value because putenv
> > can free the string without notice */
> > +===
> > #if defined(PHP_WIN32)
> >/* must copy previous value because MSVCRT's
> > putenv can free the string without notice */
> > +>>> 1.725.2.31.2.71
>
> Multiple cvs conflict alert..
Ops, the 'basic_functions.c' was accidentally.
Thanks.
>
> -Hannes
--
Regards,
Felipe Pena.
--
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/standard array.c basic_functions.c
On Sun, May 18, 2008 at 11:50 PM, Felipe Pena <[EMAIL PROTECTED]> wrote:
> felipe Sun May 18 21:50:58 2008 UTC
>
> Modified files: (Branch: PHP_5_2)
>/php-src/ext/standard array.c basic_functions.c
> Log:
> - MFB: Making compatible with 64bit platform
> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.71&r2=1.725.2.31.2.72&diff_format=u
> Index: php-src/ext/standard/basic_functions.c
> diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.71
> php-src/ext/standard/basic_functions.c:1.725.2.31.2.72
> --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.71 Mon May 12
> 08:47:29 2008
> +++ php-src/ext/standard/basic_functions.c Sun May 18 21:50:58 2008
> @@ -17,7 +17,7 @@
>+--+
> */
>
> -/* $Id: basic_functions.c,v 1.725.2.31.2.71 2008/05/12 08:47:29 tony2001 Exp
> $ */
> +/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp $
> */
>
> #include "php.h"
> #include "php_streams.h"
> @@ -3859,9 +3859,17 @@
>SetEnvironmentVariable(pe->key, "bugbug");
> #endif
>putenv(pe->previous_value);
> +<<< basic_functions.c
> +#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
> +===
> # if defined(PHP_WIN32)
> +>>> 1.725.2.31.2.71
>efree(pe->previous_value);
> +<<< basic_functions.c
> +#endif
> +===
> # endif
> +>>> 1.725.2.31.2.71
>} else {
> # if HAVE_UNSETENV
>unsetenv(pe->key);
> @@ -4461,8 +4469,13 @@
>pe.previous_value = NULL;
>for (env = environ; env != NULL && *env != NULL; env++) {
>if (!strncmp(*env, pe.key, pe.key_len) &&
> (*env)[pe.key_len] == '=') { /* found it */
> +<<< basic_functions.c
> +#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
> + /* must copy previous value because putenv
> can free the string without notice */
> +===
> #if defined(PHP_WIN32)
>/* must copy previous value because MSVCRT's
> putenv can free the string without notice */
> +>>> 1.725.2.31.2.71
Multiple cvs conflict alert..
-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) / NEWS
felipe Sun May 18 22:07:23 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Removed "short_open_tag" entry (the related patch was reverted) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.181&r2=1.2027.2.547.2.965.2.182&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.181 php-src/NEWS:1.2027.2.547.2.965.2.182 --- php-src/NEWS:1.2027.2.547.2.965.2.181 Wed May 7 20:04:05 2008 +++ php-src/NEWSSun May 18 22:07:23 2008 @@ -162,7 +162,6 @@ . Added support for OpenSSL cipher functions . Added access to internal values of DSA, RSA and DH keys - Improved md5() implementation. (Solar Designer, Dmitry) -- Allowed user-level access for short_open_tag. (Stas) - Upgraded bundled sqlite to version 3.5.6. (Scott) -- 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 array.c basic_functions.c
felipe Sun May 18 21:50:58 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard array.c basic_functions.c
Log:
- MFB: Making compatible with 64bit platform
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.55&r2=1.308.2.21.2.56&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.55
php-src/ext/standard/array.c:1.308.2.21.2.56
--- php-src/ext/standard/array.c:1.308.2.21.2.55Wed Mar 12 19:13:00 2008
+++ php-src/ext/standard/array.cSun May 18 21:50:58 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.55 2008/03/12 19:13:00 felipe Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.56 2008/05/18 21:50:58 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2250,7 +2250,7 @@
/* ..and the length */
if (length < 0) {
length = num_in - offset + length;
- } else if (((unsigned) offset + (unsigned) length) > (unsigned) num_in)
{
+ } else if (((unsigned long) offset + (unsigned long) length) >
(unsigned) num_in) {
length = num_in - offset;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.71&r2=1.725.2.31.2.72&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.71
php-src/ext/standard/basic_functions.c:1.725.2.31.2.72
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.71 Mon May 12
08:47:29 2008
+++ php-src/ext/standard/basic_functions.c Sun May 18 21:50:58 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.71 2008/05/12 08:47:29 tony2001 Exp $
*/
+/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3859,9 +3859,17 @@
SetEnvironmentVariable(pe->key, "bugbug");
#endif
putenv(pe->previous_value);
+<<< basic_functions.c
+#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
+===
# if defined(PHP_WIN32)
+>>> 1.725.2.31.2.71
efree(pe->previous_value);
+<<< basic_functions.c
+#endif
+===
# endif
+>>> 1.725.2.31.2.71
} else {
# if HAVE_UNSETENV
unsetenv(pe->key);
@@ -4461,8 +4469,13 @@
pe.previous_value = NULL;
for (env = environ; env != NULL && *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len) &&
(*env)[pe.key_len] == '=') { /* found it */
+<<< basic_functions.c
+#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
+ /* must copy previous value because putenv can
free the string without notice */
+===
#if defined(PHP_WIN32)
/* must copy previous value because MSVCRT's
putenv can free the string without notice */
+>>> 1.725.2.31.2.71
pe.previous_value = estrdup(*env);
#else
pe.previous_value = *env;
--
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 shortarc.php stub.h /ext/phar/tests phar_commitwrite.phpt phar_convert_repeated.phpt phar_create_in_cwd.phpt phar_createdefaultstub.phpt phar_offset_check.ph
sfoxSun May 18 20:52:34 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar shortarc.php stub.h
/php-src/ext/phar/tests/files nophar.phar phar_test.inc
/php-src/ext/phar/tests phar_commitwrite.phpt
phar_convert_repeated.phpt
phar_create_in_cwd.phpt
phar_createdefaultstub.phpt
phar_offset_check.phpt
phar_setdefaultstub.phpt
/php-src/ext/phar/tests/tar/files make_invalid_tar.php.inc
tarmaker.php.inc
/php-src/ext/phar/tests/tar phar_convert_phar.phpt
phar_convert_phar2.phpt
phar_convert_phar3.phpt
/php-src/ext/phar/tests/zip phar_convert_phar.phpt
Log:
- Keep 5_3 stub and creation files in sync with what I have in CVS HEAD
(MFB will likely be tomorrow now)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/shortarc.php?r1=1.12.2.1&r2=1.12.2.2&diff_format=u
Index: php-src/ext/phar/shortarc.php
diff -u php-src/ext/phar/shortarc.php:1.12.2.1
php-src/ext/phar/shortarc.php:1.12.2.2
--- php-src/ext/phar/shortarc.php:1.12.2.1 Wed May 14 21:29:51 2008
+++ php-src/ext/phar/shortarc.php Sun May 18 20:52:33 2008
@@ -114,15 +114,15 @@
{
$fp = fopen(__FILE__, 'rb');
fseek($fp, self::LEN);
-$L = unpack('V', $a = fread($fp, 4));
-$m = '';
+$L = unpack('V', $a = (binary)fread($fp, 4));
+$m = (binary)'';
do {
$read = 8192;
if ($L[1] - strlen($m) < 8192) {
$read = $L[1] - strlen($m);
}
-$last = fread($fp, $read);
+$last = (binary)fread($fp, $read);
$m .= $last;
} while (strlen($last) && strlen($m) < $L[1]);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/stub.h?r1=1.13.2.1&r2=1.13.2.2&diff_format=u
Index: php-src/ext/phar/stub.h
diff -u php-src/ext/phar/stub.h:1.13.2.1 php-src/ext/phar/stub.h:1.13.2.2
--- php-src/ext/phar/stub.h:1.13.2.1Wed May 14 21:29:51 2008
+++ php-src/ext/phar/stub.h Sun May 18 20:52:33 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: stub.h,v 1.13.2.1 2008/05/14 21:29:51 sfox Exp $ */
+/* $Id: stub.h,v 1.13.2.2 2008/05/18 20:52:33 sfox Exp $ */
static inline void phar_get_stub(const char *index_php, const char *web,
size_t *len, char **stub, const int name_len, const int web_len TSRMLS_DC)
{
@@ -24,10 +24,11 @@
static const char newstub1_0[] = "';\n\nif (in_array('phar',
stream_get_wrappers()) && class_exists('Phar', 0))
{\nPhar::interceptFileFuncs();\nset_include_path('phar://' . __FILE__ .
PATH_SEPARATOR . get_include_path());\nPhar::webPhar(null, $web);\ninclude
'phar://' . __FILE__ . '/' . Extract_Phar::START;\nreturn;\n}\n\nif
(@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) &&
($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')))
{\nExtract_Phar::go(true);\n$mimes = array(\n'phps' => 2,\n'c' =>
'text/plain',\n'cc' => 'text/plain',\n'cpp' => 'text/plain',\n'c++' =>
'text/plain',\n'dtd' => 'text/plain',\n'h' => 'text/plain',\n'log' =>
'text/plain',\n'rng' => 'text/plain',\n'txt' => 'text/plain',\n'xsd' =>
'text/plain',\n'php' => 1,\n'inc' => 1,\n'avi' => 'video/avi',\n'bmp' =>
'image/bmp',\n'css' => 'text/css',\n'gif' => 'image/gif',\n'htm' =>
'text/html',\n'html' => 'text/html',\n'htmls' => 'text/html',\n'ico' =>
'image/x-ico',!
\n'jpe' => 'image/jpeg',\n'jpg' => 'image/jpeg',\n'jpeg' =>
'image/jpeg',\n'js' => 'application/x-javascript',\n'midi' =>
'audio/midi',\n'mid' => 'audio/midi',\n'mod' => 'audio/mod',\n'mov' =>
'movie/quicktime',\n'mp3' => 'audio/mp3',\n'mpg' => 'video/mpeg',\n'mpeg' =>
'video/mpeg',\n'pdf' => 'application/pdf',\n'png' => 'image/png',\n'swf' =>
'application/shockwave-flash',\n'tif' => 'image/tiff',\n'tiff' =>
'image/tiff',\n'wav' => 'audio/wav',\n'xbm' => 'image/xbm',\n'xml' =>
'text/xml',\n);\n\nheader(\"Cache-Control: no-cache,
must-revalidate\");\nheader(\"Pragma: no-cache\");\n\n$basename =
basename(__FILE__);\nif (!strpos($_SERVER['REQUEST_URI'], $basename))
{\nchdir(Extract_Phar::$temp);\ninclude $web;\nreturn;\n}\n$pt =
substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) +
strlen($basename));\nif (!$pt || $pt == '/') {\n$pt = $web;\nheader('HTTP/1.1
301 Moved Permanently');\nheader('Location: ' . $_SERVER['REQUEST_URI'] . '/' .
$pt);\nexit;\n}\n!
$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);\nif (!
$a || strlen(dirname($a)) < strlen(";
static const char newstub1_1[] = "Extract_Phar::$temp))
{\nheader('HTTP/1.0 404 Not Found');\necho \"\\n \\n File
Not Found\\n \\n \\n 404 - File \", $pt, \" Not
Found\\n \\n\";\nexit;\n}\n$b = p
[PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c /ext/mcrypt/tests mcrypt_enc_self_test.phpt
dsp Sun May 18 19:52:46 2008 UTC
Modified files:
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/mcrypt/tests mcrypt_enc_self_test.phpt
Log:
Revert.
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.110&r2=1.111&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.110 php-src/ext/mcrypt/mcrypt.c:1.111
--- php-src/ext/mcrypt/mcrypt.c:1.110 Sun May 18 17:15:08 2008
+++ php-src/ext/mcrypt/mcrypt.c Sun May 18 19:52:46 2008
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: mcrypt.c,v 1.110 2008/05/18 17:15:08 dsp Exp $ */
+/* $Id: mcrypt.c,v 1.111 2008/05/18 19:52:46 dsp Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -476,12 +476,7 @@
PHP_FUNCTION(mcrypt_enc_self_test)
{
MCRYPT_GET_TD_ARG
-
- if (mcrypt_enc_self_test(pm->td) == 0) {
- RETURN_TRUE;
- } else {
- RETURN_FALSE;
- }
+ RETURN_LONG(mcrypt_enc_self_test(pm->td));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
diff -u php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.2
php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.3
--- php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.2 Sun May 18
17:15:08 2008
+++ php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt Sun May 18 19:52:46 2008
@@ -7,4 +7,4 @@
$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
var_dump(mcrypt_enc_self_test($td));
--EXPECT--
-bool(true)
+int(0)
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c /ext/mcrypt/tests mcrypt_enc_self_test.phpt
Hannes Magnusson wrote:
> On Sun, May 18, 2008 at 8:14 PM, David Soria Parra <[EMAIL PROTECTED]> wrote:
>> Hannes Magnusson wrote:
>>> On Sun, May 18, 2008 at 7:15 PM, David Soria Parra <[EMAIL PROTECTED]>
>>> wrote:
dsp Sun May 18 17:15:08 2008 UTC
Modified files:
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/mcrypt/tests mcrypt_enc_self_test.phpt
Log:
MFB: Make mcrypt_enc_self_test() return value compatible with
documentation and mcrypt_module_self_test()
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.109&r2=1.110&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.109 php-src/ext/mcrypt/mcrypt.c:1.110
--- php-src/ext/mcrypt/mcrypt.c:1.109 Mon Dec 31 07:12:11 2007
+++ php-src/ext/mcrypt/mcrypt.c Sun May 18 17:15:08 2008
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: mcrypt.c,v 1.109 2007/12/31 07:12:11 sebastian Exp $ */
+/* $Id: mcrypt.c,v 1.110 2008/05/18 17:15:08 dsp Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -476,7 +476,12 @@
PHP_FUNCTION(mcrypt_enc_self_test)
{
MCRYPT_GET_TD_ARG
- RETURN_LONG(mcrypt_enc_self_test(pm->td));
+
+ if (mcrypt_enc_self_test(pm->td) == 0) {
+ RETURN_TRUE;
+ } else {
+ RETURN_FALSE;
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
diff -u php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1
php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.2
--- php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1 Sat May 17
23:27:42 2008
+++ php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt Sun May 18
17:15:08 2008
@@ -7,4 +7,4 @@
$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
var_dump(mcrypt_enc_self_test($td));
--EXPECT--
-int(0)
\ No newline at end of file
+bool(true)
>>> This is a massive BC break...
>>> Imagine people who did if (mcrypt_enc_self_test($td) == 0) { ... }
>>> that has now changed from dealing with success to failure.
>>>
>>> I'd say rather fix the docs
>>>
>>> -Hannes
>> Yes I noticed that, that's why its not in 5.2. I think it's kind of
>> "cleaning up" as
>> mcrypt_module_self_test return a boolean too and the docs say it too. Maybe
>> it's just in my opinion
>> that the function itself is not that often used as it would be real issue,
>> but if people have
>> objections for sure we can revert that.
>
> The point is this is a very subtle change and not something people
> will suspect when their applications stop working out of the blue,
> without so much as a single warning.
> A function rename would be obvious as it would give a fatal error, but
> this is a return value change from false to true...
>
> IMO this should be reverted and the docs fixed.
>
reverted.
> -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/mcrypt mcrypt.c /ext/mcrypt/tests mcrypt_enc_self_test.phpt
dsp Sun May 18 19:48:40 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/mcrypt/tests mcrypt_enc_self_test.phpt
Log:
Revert.
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.11.2.4&r2=1.91.2.3.2.11.2.5&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.4
php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.5
--- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.4 Sun May 18 17:08:56 2008
+++ php-src/ext/mcrypt/mcrypt.c Sun May 18 19:48:39 2008
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.4 2008/05/18 17:08:56 dsp Exp $ */
+/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.5 2008/05/18 19:48:39 dsp Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -589,12 +589,7 @@
PHP_FUNCTION(mcrypt_enc_self_test)
{
MCRYPT_GET_TD_ARG
-
- if (mcrypt_enc_self_test(pm->td) == 0) {
- RETURN_TRUE;
- } else {
- RETURN_FALSE;
- }
+ RETURN_LONG(mcrypt_enc_self_test(pm->td));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
diff -u php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1.2.3
php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1.2.4
--- php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1.2.3 Sun May 18
17:08:56 2008
+++ php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt Sun May 18 19:48:40 2008
@@ -7,4 +7,4 @@
$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
var_dump(mcrypt_enc_self_test($td));
--EXPECT--
-bool(true)
+int(0)
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c /ext/mcrypt/tests mcrypt_enc_self_test.phpt
On Sun, May 18, 2008 at 8:14 PM, David Soria Parra <[EMAIL PROTECTED]> wrote:
> Hannes Magnusson wrote:
>> On Sun, May 18, 2008 at 7:15 PM, David Soria Parra <[EMAIL PROTECTED]> wrote:
>>> dsp Sun May 18 17:15:08 2008 UTC
>>>
>>> Modified files:
>>>/php-src/ext/mcrypt mcrypt.c
>>>/php-src/ext/mcrypt/tests mcrypt_enc_self_test.phpt
>>> Log:
>>> MFB: Make mcrypt_enc_self_test() return value compatible with
>>> documentation and mcrypt_module_self_test()
>>>
>>>
>>> http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.109&r2=1.110&diff_format=u
>>> Index: php-src/ext/mcrypt/mcrypt.c
>>> diff -u php-src/ext/mcrypt/mcrypt.c:1.109 php-src/ext/mcrypt/mcrypt.c:1.110
>>> --- php-src/ext/mcrypt/mcrypt.c:1.109 Mon Dec 31 07:12:11 2007
>>> +++ php-src/ext/mcrypt/mcrypt.c Sun May 18 17:15:08 2008
>>> @@ -16,7 +16,7 @@
>>>| Derick Rethans <[EMAIL PROTECTED]>|
>>>+--+
>>> */
>>> -/* $Id: mcrypt.c,v 1.109 2007/12/31 07:12:11 sebastian Exp $ */
>>> +/* $Id: mcrypt.c,v 1.110 2008/05/18 17:15:08 dsp Exp $ */
>>>
>>> #ifdef HAVE_CONFIG_H
>>> #include "config.h"
>>> @@ -476,7 +476,12 @@
>>> PHP_FUNCTION(mcrypt_enc_self_test)
>>> {
>>>MCRYPT_GET_TD_ARG
>>> - RETURN_LONG(mcrypt_enc_self_test(pm->td));
>>> +
>>> + if (mcrypt_enc_self_test(pm->td) == 0) {
>>> + RETURN_TRUE;
>>> + } else {
>>> + RETURN_FALSE;
>>> + }
>>> }
>>> /* }}} */
>>>
>>> http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt?r1=1.1&r2=1.2&diff_format=u
>>> Index: php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
>>> diff -u php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1
>>> php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.2
>>> --- php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1 Sat May 17
>>> 23:27:42 2008
>>> +++ php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt Sun May 18 17:15:08
>>> 2008
>>> @@ -7,4 +7,4 @@
>>> $td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
>>> var_dump(mcrypt_enc_self_test($td));
>>> --EXPECT--
>>> -int(0)
>>> \ No newline at end of file
>>> +bool(true)
>>
>> This is a massive BC break...
>> Imagine people who did if (mcrypt_enc_self_test($td) == 0) { ... }
>> that has now changed from dealing with success to failure.
>>
>> I'd say rather fix the docs
>>
>> -Hannes
>
> Yes I noticed that, that's why its not in 5.2. I think it's kind of "cleaning
> up" as
> mcrypt_module_self_test return a boolean too and the docs say it too. Maybe
> it's just in my opinion
> that the function itself is not that often used as it would be real issue,
> but if people have
> objections for sure we can revert that.
The point is this is a very subtle change and not something people
will suspect when their applications stop working out of the blue,
without so much as a single warning.
A function rename would be obvious as it would give a fatal error, but
this is a return value change from false to true...
IMO this should be reverted and the docs fixed.
-Hannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c /ext/mcrypt/tests mcrypt_enc_self_test.phpt
Hannes Magnusson wrote:
> On Sun, May 18, 2008 at 7:15 PM, David Soria Parra <[EMAIL PROTECTED]> wrote:
>> dsp Sun May 18 17:15:08 2008 UTC
>>
>> Modified files:
>>/php-src/ext/mcrypt mcrypt.c
>>/php-src/ext/mcrypt/tests mcrypt_enc_self_test.phpt
>> Log:
>> MFB: Make mcrypt_enc_self_test() return value compatible with documentation
>> and mcrypt_module_self_test()
>>
>>
>> http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.109&r2=1.110&diff_format=u
>> Index: php-src/ext/mcrypt/mcrypt.c
>> diff -u php-src/ext/mcrypt/mcrypt.c:1.109 php-src/ext/mcrypt/mcrypt.c:1.110
>> --- php-src/ext/mcrypt/mcrypt.c:1.109 Mon Dec 31 07:12:11 2007
>> +++ php-src/ext/mcrypt/mcrypt.c Sun May 18 17:15:08 2008
>> @@ -16,7 +16,7 @@
>>| Derick Rethans <[EMAIL PROTECTED]>|
>>+--+
>> */
>> -/* $Id: mcrypt.c,v 1.109 2007/12/31 07:12:11 sebastian Exp $ */
>> +/* $Id: mcrypt.c,v 1.110 2008/05/18 17:15:08 dsp Exp $ */
>>
>> #ifdef HAVE_CONFIG_H
>> #include "config.h"
>> @@ -476,7 +476,12 @@
>> PHP_FUNCTION(mcrypt_enc_self_test)
>> {
>>MCRYPT_GET_TD_ARG
>> - RETURN_LONG(mcrypt_enc_self_test(pm->td));
>> +
>> + if (mcrypt_enc_self_test(pm->td) == 0) {
>> + RETURN_TRUE;
>> + } else {
>> + RETURN_FALSE;
>> + }
>> }
>> /* }}} */
>>
>> http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt?r1=1.1&r2=1.2&diff_format=u
>> Index: php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
>> diff -u php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1
>> php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.2
>> --- php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1 Sat May 17
>> 23:27:42 2008
>> +++ php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt Sun May 18 17:15:08
>> 2008
>> @@ -7,4 +7,4 @@
>> $td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
>> var_dump(mcrypt_enc_self_test($td));
>> --EXPECT--
>> -int(0)
>> \ No newline at end of file
>> +bool(true)
>
> This is a massive BC break...
> Imagine people who did if (mcrypt_enc_self_test($td) == 0) { ... }
> that has now changed from dealing with success to failure.
>
> I'd say rather fix the docs
>
> -Hannes
Yes I noticed that, that's why its not in 5.2. I think it's kind of "cleaning
up" as
mcrypt_module_self_test return a boolean too and the docs say it too. Maybe
it's just in my opinion
that the function itself is not that often used as it would be real issue, but
if people have
objections for sure we can revert that.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c /ext/mcrypt/tests mcrypt_enc_self_test.phpt
On Sun, May 18, 2008 at 7:15 PM, David Soria Parra <[EMAIL PROTECTED]> wrote:
> dsp Sun May 18 17:15:08 2008 UTC
>
> Modified files:
>/php-src/ext/mcrypt mcrypt.c
>/php-src/ext/mcrypt/tests mcrypt_enc_self_test.phpt
> Log:
> MFB: Make mcrypt_enc_self_test() return value compatible with documentation
> and mcrypt_module_self_test()
>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.109&r2=1.110&diff_format=u
> Index: php-src/ext/mcrypt/mcrypt.c
> diff -u php-src/ext/mcrypt/mcrypt.c:1.109 php-src/ext/mcrypt/mcrypt.c:1.110
> --- php-src/ext/mcrypt/mcrypt.c:1.109 Mon Dec 31 07:12:11 2007
> +++ php-src/ext/mcrypt/mcrypt.c Sun May 18 17:15:08 2008
> @@ -16,7 +16,7 @@
>| Derick Rethans <[EMAIL PROTECTED]>|
>+--+
> */
> -/* $Id: mcrypt.c,v 1.109 2007/12/31 07:12:11 sebastian Exp $ */
> +/* $Id: mcrypt.c,v 1.110 2008/05/18 17:15:08 dsp Exp $ */
>
> #ifdef HAVE_CONFIG_H
> #include "config.h"
> @@ -476,7 +476,12 @@
> PHP_FUNCTION(mcrypt_enc_self_test)
> {
>MCRYPT_GET_TD_ARG
> - RETURN_LONG(mcrypt_enc_self_test(pm->td));
> +
> + if (mcrypt_enc_self_test(pm->td) == 0) {
> + RETURN_TRUE;
> + } else {
> + RETURN_FALSE;
> + }
> }
> /* }}} */
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt?r1=1.1&r2=1.2&diff_format=u
> Index: php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
> diff -u php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1
> php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.2
> --- php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1 Sat May 17
> 23:27:42 2008
> +++ php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt Sun May 18 17:15:08
> 2008
> @@ -7,4 +7,4 @@
> $td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
> var_dump(mcrypt_enc_self_test($td));
> --EXPECT--
> -int(0)
> \ No newline at end of file
> +bool(true)
This is a massive BC break...
Imagine people who did if (mcrypt_enc_self_test($td) == 0) { ... }
that has now changed from dealing with success to failure.
I'd say rather fix the docs
-Hannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c /ext/mcrypt/tests mcrypt_enc_self_test.phpt
dsp Sun May 18 17:15:08 2008 UTC
Modified files:
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/mcrypt/tests mcrypt_enc_self_test.phpt
Log:
MFB: Make mcrypt_enc_self_test() return value compatible with documentation
and mcrypt_module_self_test()
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.109&r2=1.110&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.109 php-src/ext/mcrypt/mcrypt.c:1.110
--- php-src/ext/mcrypt/mcrypt.c:1.109 Mon Dec 31 07:12:11 2007
+++ php-src/ext/mcrypt/mcrypt.c Sun May 18 17:15:08 2008
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: mcrypt.c,v 1.109 2007/12/31 07:12:11 sebastian Exp $ */
+/* $Id: mcrypt.c,v 1.110 2008/05/18 17:15:08 dsp Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -476,7 +476,12 @@
PHP_FUNCTION(mcrypt_enc_self_test)
{
MCRYPT_GET_TD_ARG
- RETURN_LONG(mcrypt_enc_self_test(pm->td));
+
+ if (mcrypt_enc_self_test(pm->td) == 0) {
+ RETURN_TRUE;
+ } else {
+ RETURN_FALSE;
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
diff -u php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1
php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.2
--- php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1 Sat May 17
23:27:42 2008
+++ php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt Sun May 18 17:15:08 2008
@@ -7,4 +7,4 @@
$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
var_dump(mcrypt_enc_self_test($td));
--EXPECT--
-int(0)
\ No newline at end of file
+bool(true)
--
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/mcrypt mcrypt.c /ext/mcrypt/tests mcrypt_enc_self_test.phpt
dsp Sun May 18 17:08:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/mcrypt/tests mcrypt_enc_self_test.phpt
Log:
Make mcrypt_enc_self_test() return value compatible with documentation and
mcrypt _module_self_test()
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.11.2.3&r2=1.91.2.3.2.11.2.4&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.3
php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.4
--- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.3 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mcrypt/mcrypt.c Sun May 18 17:08:56 2008
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.3 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.4 2008/05/18 17:08:56 dsp Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -589,7 +589,12 @@
PHP_FUNCTION(mcrypt_enc_self_test)
{
MCRYPT_GET_TD_ARG
- RETURN_LONG(mcrypt_enc_self_test(pm->td));
+
+ if (mcrypt_enc_self_test(pm->td) == 0) {
+ RETURN_TRUE;
+ } else {
+ RETURN_FALSE;
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt
diff -u php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1.2.2
php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1.2.3
--- php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1.2.2 Sat May 17
23:29:14 2008
+++ php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt Sun May 18 17:08:56 2008
@@ -7,4 +7,4 @@
$td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, '');
var_dump(mcrypt_enc_self_test($td));
--EXPECT--
-int(0)
\ No newline at end of file
+bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c
felipe Sun May 18 15:52:43 2008 UTC
Modified files:
/php-src/ext/standard array.c
Log:
- MFB: Making compatible with 64bit platform
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.449&r2=1.450&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.449 php-src/ext/standard/array.c:1.450
--- php-src/ext/standard/array.c:1.449 Tue Apr 29 08:15:49 2008
+++ php-src/ext/standard/array.cSun May 18 15:52:42 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.449 2008/04/29 08:15:49 dmitry Exp $ */
+/* $Id: array.c,v 1.450 2008/05/18 15:52:42 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2350,7 +2350,7 @@
/* ..and the length */
if (length < 0) {
length = num_in - offset + length;
- } else if (((unsigned) offset + (unsigned) length) > (unsigned) num_in)
{
+ } else if (((unsigned long) offset + (unsigned long) length) >
(unsigned) num_in) {
length = num_in - offset;
}
--
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 array.c /ext/standard/tests/array array_slice_variation6.phpt
felipe Sun May 18 15:42:09 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
/php-src/ext/standard/tests/array array_slice_variation6.phpt
Log:
- Making compatible with 64bit plataform
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.29&r2=1.308.2.21.2.37.2.30&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.29
php-src/ext/standard/array.c:1.308.2.21.2.37.2.30
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.29 Sun May 4 11:26:50 2008
+++ php-src/ext/standard/array.cSun May 18 15:42:08 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.29 2008/05/04 11:26:50 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.30 2008/05/18 15:42:08 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2163,7 +2163,7 @@
/* ..and the length */
if (length < 0) {
length = num_in - offset + length;
- } else if (((unsigned) offset + (unsigned) length) > (unsigned) num_in)
{
+ } else if (((unsigned long) offset + (unsigned long) length) >
(unsigned) num_in) {
length = num_in - offset;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice_variation6.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_slice_variation6.phpt
diff -u php-src/ext/standard/tests/array/array_slice_variation6.phpt:1.1.4.3
php-src/ext/standard/tests/array/array_slice_variation6.phpt:1.1.4.4
--- php-src/ext/standard/tests/array/array_slice_variation6.phpt:1.1.4.3
Mon Apr 14 23:17:30 2008
+++ php-src/ext/standard/tests/array/array_slice_variation6.phptSun May
18 15:42:09 2008
@@ -133,10 +133,18 @@
}
-- $length is maximum integer value --
-array(0) {
+array(4) {
+ [0]=>
+ string(3) "two"
+ [1]=>
+ string(5) "three"
+ [2]=>
+ string(4) "nine"
+ ["ten"]=>
+ int(10)
}
-- $length is minimum integer value --
array(0) {
}
-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
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mcrypt/testsmcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phptmcrypt_create_iv.phpt~ mcrypt_decrypt.phpt mcrypt_ecb.phptmcrypt_enc_get_algorithms_name.phpt
Lars Strojny wrote: > Hi David, > > Am Samstag, den 17.05.2008, 23:31 + schrieb David Soria Parra: >> dsp Sat May 17 23:31:32 2008 UTC >> >> Added files: (Branch: PHP_5_2) > [...] >> mcrypt_create_iv.phpt~ > > This was included on purpose? It is also in 5_3. no for sure not, thanks for the hint, i removed it. > cu, Lars -- 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/mcrypt/tests mcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phpt mcrypt_create_iv.phpt~ mcrypt_decrypt.phpt mcrypt_ecb.phpt mcrypt_enc_get_algorithms_name.ph
Hi Illia, Am Sonntag, den 18.05.2008, 10:29 -0400 schrieb Ilia Alshanetsky: > Nothing wrong with adding tests to the 5.2 branch... [...] > >>mcrypt_create_iv.phpt~ > > > > This was included on purpose? It is also in 5_3. I referred to the backup file, not that the tests were added. cu, Lars signature.asc Description: Dies ist ein digital signierter Nachrichtenteil
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/basic 021.phpt
iliaa Sun May 18 14:36:59 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/basic021.phpt Log: MFB: Added missing INI handler http://cvs.php.net/viewvc.cgi/php-src/tests/basic/021.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.3&diff_format=u Index: php-src/tests/basic/021.phpt diff -u php-src/tests/basic/021.phpt:1.1.2.1.2.2 php-src/tests/basic/021.phpt:1.1.2.1.2.3 --- php-src/tests/basic/021.phpt:1.1.2.1.2.2Fri May 19 10:57:48 2006 +++ php-src/tests/basic/021.phptSun May 18 14:36:59 2008 @@ -1,5 +1,7 @@ --TEST-- Bug #37276 (problems witch $_POST array) +--INI-- +file_upload=1 --SKIPIF-- --POST_RAW-- -- 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/basic 021.phpt
iliaa Sun May 18 14:35:13 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/tests/basic021.phpt Log: Added missing INI handler http://cvs.php.net/viewvc.cgi/php-src/tests/basic/021.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.2.2.1&diff_format=u Index: php-src/tests/basic/021.phpt diff -u php-src/tests/basic/021.phpt:1.1.2.1.2.2 php-src/tests/basic/021.phpt:1.1.2.1.2.2.2.1 --- php-src/tests/basic/021.phpt:1.1.2.1.2.2Fri May 19 10:57:48 2006 +++ php-src/tests/basic/021.phptSun May 18 14:35:13 2008 @@ -1,5 +1,7 @@ --TEST-- Bug #37276 (problems witch $_POST array) +--INI-- +file_upload=1 --SKIPIF-- --POST_RAW-- -- 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/mcrypt/tests mcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phpt mcrypt_create_iv.phpt~ mcrypt_decrypt.phpt mcrypt_ecb.phpt mcrypt_enc_get_algorithms_name.ph
Nothing wrong with adding tests to the 5.2 branch... On 18-May-08, at 6:50 AM, Lars Strojny wrote: Hi David, Am Samstag, den 17.05.2008, 23:31 + schrieb David Soria Parra: dsp Sat May 17 23:31:32 2008 UTC Added files: (Branch: PHP_5_2) [...] mcrypt_create_iv.phpt~ This was included on purpose? It is also in 5_3. cu, Lars Ilia Alshanetsky -- 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/mcrypt/tests mcrypt_create_iv.phpt~
dsp Sun May 18 14:28:19 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/mcrypt/tests mcrypt_create_iv.phpt~ Log: Wrong 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) /ext/mcrypt/tests mcrypt_create_iv.phpt~
dsp Sun May 18 14:27:52 2008 UTC Removed files: (Branch: PHP_5_2) /php-src/ext/mcrypt/tests mcrypt_create_iv.phpt~ Log: Wrong 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) /ext/spl spl_directory.c spl_directory.h /ext/spl/tests dit_004.phpt dit_005.phpt
colder Sun May 18 12:17:43 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests dit_004.phpt dit_005.phpt
Modified files:
/php-src/ext/splspl_directory.c spl_directory.h
Log:
MFH: Fix filesystemiterator with ./.. + add cloning tests
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.19&r2=1.45.2.27.2.23.2.20&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.19
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.20
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.19 Wed Apr 9 19:01:12 2008
+++ php-src/ext/spl/spl_directory.c Sun May 18 12:17:43 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.19 2008/04/09 19:01:12 colder Exp $
*/
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.20 2008/05/18 12:17:43 colder Exp $
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -200,10 +200,18 @@
#define IS_SLASH_AT(zs, pos) (IS_SLASH(zs[pos]))
+static inline int spl_filesystem_is_dot(const char * d_name) /* {{{ */
+{
+ return !strcmp(d_name, ".") || !strcmp(d_name, "..");
+}
+/* }}} */
+
/* {{{ spl_filesystem_dir_open */
/* open a directory resource */
static void spl_filesystem_dir_open(spl_filesystem_object* intern, char *path
TSRMLS_DC)
{
+ int skip_dots = intern->flags & SPL_FILE_DIR_SKIPDOTS;
+
intern->type = SPL_FS_DIR;
intern->_path_len = strlen(path);
intern->u.dir.dirp = php_stream_opendir(path,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
@@ -219,7 +227,9 @@
/* throw exception: should've been already happened */
intern->u.dir.entry.d_name[0] = '\0';
} else {
- spl_filesystem_dir_read(intern TSRMLS_CC);
+ do {
+ spl_filesystem_dir_read(intern TSRMLS_CC);
+ } while (skip_dots &&
spl_filesystem_is_dot(intern->u.dir.entry.d_name));
}
}
/* }}} */
@@ -277,6 +287,7 @@
zend_object_handle handle = Z_OBJ_HANDLE_P(zobject);
spl_filesystem_object *intern;
spl_filesystem_object *source;
+ int index, skip_dots;
old_object = zend_objects_get_address(zobject TSRMLS_CC);
source = (spl_filesystem_object*)old_object;
@@ -284,6 +295,8 @@
new_obj_val = spl_filesystem_object_new_ex(old_object->ce, &intern
TSRMLS_CC);
new_object = &intern->std;
+ intern->flags = source->flags;
+
switch (source->type) {
case SPL_FS_INFO:
intern->_path_len = source->_path_len;
@@ -293,6 +306,14 @@
break;
case SPL_FS_DIR:
spl_filesystem_dir_open(intern, source->_path TSRMLS_CC);
+ /* read until we hit the position in which we were before */
+ skip_dots = source->flags & SPL_FILE_DIR_SKIPDOTS;
+ for(index = 0; index < source->u.dir.index; ++index) {
+ do {
+ spl_filesystem_dir_read(intern TSRMLS_CC);
+ } while (skip_dots &&
spl_filesystem_is_dot(intern->u.dir.entry.d_name));
+ }
+ intern->u.dir.index = index;
break;
case SPL_FS_FILE:
php_error_docref(NULL TSRMLS_CC, E_ERROR, "An object of class
%s cannot be cloned", old_object->ce->name);
@@ -301,7 +322,6 @@
intern->file_class = source->file_class;
intern->info_class = source->info_class;
- intern->flags = source->flags;
intern->oth = source->oth;
intern->oth_handler = source->oth_handler;
@@ -468,12 +488,6 @@
return NULL;
} /* }}} */
-static inline int spl_filesystem_is_dot(const char * d_name) /* {{{ */
-{
- return !strcmp(d_name, ".") || !strcmp(d_name, "..");
-}
-/* }}} */
-
static int spl_filesystem_is_invalid_or_dot(const char * d_name) /* {{{ */
{
return d_name[0] == '\0' || spl_filesystem_is_dot(d_name);
@@ -562,6 +576,9 @@
flags =
SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_SELF;
parsed = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&path, &len);
}
+ if (ctor_flags & SPL_FILE_DIR_SKIPDOTS) {
+ flags |= SPL_FILE_DIR_SKIPDOTS;
+ }
if (parsed == FAILURE) {
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return;
@@ -573,6 +590,7 @@
}
intern = (spl_filesystem_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+ intern->flags = flags;
if ((ctor_flags & DIT_CTOR_GLOB) && strstr(path, "glob://") != path) {
spprintf(&path, 0, "glob://%s", path);
spl_filesystem_dir_open(intern, path TSRMLS_CC);
@@ -582,7 +600,6 @@
}
intern->u.dir.is_recursive = instanceof_functio
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mcrypt/tests mcrypt_cbc.phpt mcrypt_cbf.phpt mcrypt_create_iv.phpt mcrypt_create_iv.phpt~ mcrypt_decrypt.phpt mcrypt_ecb.phpt mcrypt_enc_get_algorithms_name.ph
Hi David, Am Samstag, den 17.05.2008, 23:31 + schrieb David Soria Parra: > dsp Sat May 17 23:31:32 2008 UTC > > Added files: (Branch: PHP_5_2) [...] > mcrypt_create_iv.phpt~ This was included on purpose? It is also in 5_3. cu, Lars signature.asc Description: Dies ist ein digital signierter Nachrichtenteil
