PHP world News

Re: [PHP] php image and javascript include

2008-09-07T16:11:00.000-07:00

Dreamweaver? Eclipse? Pah, it's all about using a text editor! Kate (on KDE) is my preference ;)

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2008-09-07T16:08:00.001-07:00

felipe Sun Sep 7 23:08:21 2008 UTC

Modified files: (Branch: PHP_5_3)
/php-src NEWS
Log:
- New entry

http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.309&r2=1.2027.2.547.2.965.2.310&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.309 php-src/NEWS:1.2027.2.547.2.965.2.310
--- php-src/NEWS:1.2027.2.547.2.965.2.309 Sun Sep 7 13:15:59 2008
+++ php-src/NEWS Sun Sep 7 23:08:20 2008
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 200?, PHP 5.3.0 Alpha 3
+- Changed Soap methods error level, now it is no longer E_ERROR. (Felipe)
+
- Fixed bug #45911 (Cannot disable ext/hash). (Arnaud)

02 Sep 2008, PHP 5.3.0 Alpha 2

--
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 mcrypt.c /ext/mcrypt/tests bug46010.phpt mcrypt_ecb.phpt

2008-09-07T16:00:00.001-07:00

felipe Sun Sep 7 23:00:31 2008 UTC

Added files: (Branch: PHP_5_2)
/php-src/ext/mcrypt/tests bug46010.phpt

Modified files:
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/mcrypt/tests mcrypt_ecb.phpt
Log:
- MFH: Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode)

http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.12&r2=1.91.2.3.2.13&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.12 php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.13
--- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.12 Mon Dec 31 07:20:08 2007
+++ php-src/ext/mcrypt/mcrypt.c Sun Sep 7 23:00:31 2008
@@ -16,7 +16,7 @@
| Derick Rethans <derick@derickrethans.nl> |
+----------------------------------------------------------------------+
*/
-/* $Id: mcrypt.c,v 1.91.2.3.2.12 2007/12/31 07:20:08 sebastian Exp $ */
+/* $Id: mcrypt.c,v 1.91.2.3.2.13 2008/09/07 23:00:31 felipe Exp $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1041,15 +1041,17 @@
/* Check IV */
iv_s = NULL;
iv_size = mcrypt_enc_get_iv_size (td);
- if (argc == 5) {
- if (iv_size != Z_STRLEN_PP(iv)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, MCRYPT_IV_WRONG_SIZE);
- } else {
- iv_s = emalloc(iv_size + 1);
- memcpy(iv_s, Z_STRVAL_PP(iv), iv_size);
- }
- } else if (argc == 4) {
- if (iv_size != 0) {
+
+ /* IV is required */
+ if (mcrypt_enc_mode_has_iv(td) == 1) {
+ if (argc == 5) {
+ if (iv_size != Z_STRLEN_PP(iv)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, MCRYPT_IV_WRONG_SIZE);
+ } else {
+ iv_s = emalloc(iv_size + 1);
+ memcpy(iv_s, Z_STRVAL_PP(iv), iv_size);
+ }
+ } else if (argc == 4) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to use an empty IV, which is NOT recommend");
iv_s = emalloc(iv_size + 1);
memset(iv_s, 0, iv_size + 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_ecb.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/mcrypt/tests/mcrypt_ecb.phpt
diff -u php-src/ext/mcrypt/tests/mcrypt_ecb.phpt:1.1.4.2 php-src/ext/mcrypt/tests/mcrypt_ecb.phpt:1.1.4.3
--- php-src/ext/mcrypt/tests/mcrypt_ecb.phpt:1.1.4.2 Sat May 17 23:31:31 2008
+++ php-src/ext/mcrypt/tests/mcrypt_ecb.phpt Sun Sep 7 23:00:31 2008
@@ -14,10 +14,10 @@
// we have to trim as AES rounds the blocks and decrypt doesnt detect that
echo trim(mcrypt_ecb($cipher, $key, $enc_data, MCRYPT_DECRYPT, $iv)) . "\n";

-// a warning must be issued if we don't use a IV on a AES cipher, that usually requires an IV
+// a warning not must be issued if we don't use a IV on a AES cipher, that not requires an IV
mcrypt_ecb($cipher, $key, $enc_data, MCRYPT_DECRYPT);

--EXPECTF--
PHP Testfest 2008

-Warning: mcrypt_ecb(): Attempt to use an empty IV, which is NOT recommend in %s on line %d
+

http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/bug46010.phpt?view=markup&rev=1.1
Index: php-src/ext/mcrypt/tests/bug46010.phpt
+++ php-src/ext/mcrypt/tests/bug46010.phpt
--TEST---
Bug #46010 (warnings incorrectly generated for iv in ecb mode)
--FILE--
<?php

var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, "key", "data", MCRYPT_MODE_ECB)));
var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, "key", "data", MCRYPT_MODE_ECB, "a")));
var_dump(bin2hex(mcrypt_encrypt(MCRYPT_TRIPLEDES, "key", "data", MCRYPT_MODE_ECB, "12345678")));

?>
--EXPECTF--
string(16) "372eeb4a524b8d31"
string(16) "372eeb4a524b8d31"
string(16) "372eeb4a524b8d31"

--
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 bug46010.phpt

2008-09-07T15:57:00.001-07:00

felipe Sun Sep 7 22:57:37 2008 UTC

Added files: (Branch: PHP_5_3)
/php-src/ext/mcrypt/tests bug46010.phpt

Modified files:
/php-src/ext/mcrypt mcrypt.c
Log:
- MFH: Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode)

http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.11.2.11&r2=1.91.2.3.2.11.2.12&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.11 php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.12
--- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.11 Sun Aug 10 05:38:07 2008
+++ php-src/ext/mcrypt/mcrypt.c Sun Sep 7 22:57:37 2008
@@ -16,7 +16,7 @@
| Derick Rethans <derick@derickrethans.nl> |
+----------------------------------------------------------------------+
*/
-/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.11 2008/08/10 05:38:07 felipe Exp $ */
+/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.12 2008/09/07 22:57:37 felipe Exp $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1196,7 +1196,7 @@
{
char *cipher_dir_string;
char *module_dir_string;
- int block_size, max_key_length, use_key_length, i, count, iv_size, req_iv;
+ int block_size, max_key_length, use_key_length, i, count, iv_size;
unsigned long int data_size;
int *key_length_sizes;
char *key_s = NULL, *iv_s;
@@ -1244,16 +1244,17 @@
/* Check IV */
iv_s = NULL;
iv_size = mcrypt_enc_get_iv_size (td);
- req_iv = mcrypt_enc_mode_has_iv(td);
- if (argc == 5) {
- if (iv_size != iv_len) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, MCRYPT_IV_WRONG_SIZE);
- } else {
- iv_s = emalloc(iv_size + 1);
- memcpy(iv_s, iv, iv_size);
- }
- } else if (argc == 4) {
- if (req_iv == 1) {
+
+ /* IV is required */
+ if (mcrypt_enc_mode_has_iv(td) == 1) {
+ if (argc == 5) {
+ if (iv_size != iv_len) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, MCRYPT_IV_WRONG_SIZE);
+ } else {
+ iv_s = emalloc(iv_size + 1);
+ memcpy(iv_s, iv, iv_size);
+ }
+ } else if (argc == 4) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to use an empty IV, which is NOT recommend");
iv_s = emalloc(iv_size + 1);
memset(iv_s, 0, iv_size + 1);

?>
--EXPECTF--
string(16) "372eeb4a524b8d31"
string(16) "372eeb4a524b8d31"
string(16) "372eeb4a524b8d31"

--
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 bug46010.phpt

2008-09-07T15:53:00.001-07:00

felipe Sun Sep 7 22:53:21 2008 UTC

Added files:
/php-src/ext/mcrypt/tests bug46010.phpt

Modified files:
/php-src/ext/mcrypt mcrypt.c
Log:
- Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode)

http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.114&r2=1.115&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.114 php-src/ext/mcrypt/mcrypt.c:1.115
--- php-src/ext/mcrypt/mcrypt.c:1.114 Wed Jul 16 08:00:43 2008
+++ php-src/ext/mcrypt/mcrypt.c Sun Sep 7 22:53:20 2008
@@ -16,7 +16,7 @@
| Derick Rethans <derick@derickrethans.nl> |
+----------------------------------------------------------------------+
*/
-/* $Id: mcrypt.c,v 1.114 2008/07/16 08:00:43 tony2001 Exp $ */
+/* $Id: mcrypt.c,v 1.115 2008/09/07 22:53:20 felipe Exp $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1276,7 +1276,7 @@
{
MCRYPT td;
char *cipher_dir_string, *module_dir_string, *key_copy, *iv_copy;
- int i, status = SUCCESS, count, *key_sizes, key_size, iv_size, block_size, iv_req;
+ int i, status = SUCCESS, count, *key_sizes, key_size, iv_size, block_size;

MCRYPT_GET_INI

@@ -1314,20 +1314,20 @@
mcrypt_free(key_sizes);

iv_size = mcrypt_enc_get_iv_size(td);
- iv_req = mcrypt_enc_mode_has_iv(td);
- if (iv_len) {
- if (iv_len == iv_size) {
- iv_copy = estrndup(iv_str, iv_len);
+ /* IV is required */
+ if (mcrypt_enc_mode_has_iv(td) == 1) {
+ if (iv_len) {
+ if (iv_len == iv_size) {
+ iv_copy = estrndup(iv_str, iv_len);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, MCRYPT_IV_WRONG_SIZE);
+ iv_copy = ecalloc(1, iv_size);
+ memcpy(iv_copy, iv_str, MIN(iv_len, iv_size));
+ }
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, MCRYPT_IV_WRONG_SIZE);
- iv_copy = ecalloc(1, iv_size);
- memcpy(iv_copy, iv_str, MIN(iv_len, iv_size));
- }
- } else {
- if (iv_req) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to use an empty IV, which is NOT recommended");
+ iv_copy = ecalloc(1, iv_size);
}
- iv_copy = ecalloc(1, iv_size);
}

if (mcrypt_enc_is_block_mode(td) == 1) {

?>
--EXPECTF--
string(16) "372eeb4a524b8d31"
string(16) "372eeb4a524b8d31"
string(16) "372eeb4a524b8d31"

--
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/security open_basedir_copy.phpt open_basedir_dir.phpt open_basedir_error_log_variation.phpt open_basedir_file.phpt open_basedir_file_get_contents.phpt open_basedir_file_put_contents.phpt open_basedir_fopen.phpt open_basedir_opendir.phpt open_basedir_scandir.phpt

2008-09-07T15:35:00.001-07:00

http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_copy.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/open_basedir_copy.phpt
diff -u php-src/tests/security/open_basedir_copy.phpt:1.1.2.1 php-src/tests/security/open_basedir_copy.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_copy.phpt:1.1.2.1 Fri May 9 08:35:58 2008
+++ php-src/tests/security/open_basedir_copy.phpt Sun Sep 7 22:35:15 2008
@@ -36,42 +36,42 @@

Warning: copy(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/./bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad/./bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(./../.): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(./../.): failed to open stream: %s in %s on line %d
bool(false)
bool(true)
bool(true)
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_dir.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/open_basedir_dir.phpt
diff -u php-src/tests/security/open_basedir_dir.phpt:1.1.2.1 php-src/tests/security/open_basedir_dir.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_dir.phpt:1.1.2.1 Fri May 9 08:35:58 2008
+++ php-src/tests/security/open_basedir_dir.phpt Sun Sep 7 22:35:15 2008
@@ -29,42 +29,42 @@

Warning: dir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../bad): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(..): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(..): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(/): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(/): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../bad/.): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)
object(Directory)#%d (2) {
["path"]=>
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_error_log_variation.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/open_basedir_error_log_variation.phpt
diff -u php-src/tests/security/open_basedir_error_log_variation.phpt:1.1.2.1 php-src/tests/security/open_basedir_error_log_variation.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_error_log_variation.phpt:1.1.2.1 Fri May 9 08:33:54 2008
+++ php-src/tests/security/open_basedir_error_log_variation.phpt Sun Sep 7 22:35:15 2008
@@ -31,17 +31,17 @@

Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: error_log(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/test/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: error_log(%s/test/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: error_log(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: error_log(%s/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
bool(true)
*** Finished testing open_basedir configuration [error_log] ***
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/open_basedir_file.phpt
diff -u php-src/tests/security/open_basedir_file.phpt:1.1.2.1 php-src/tests/security/open_basedir_file.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_file.phpt:1.1.2.1 Fri May 9 08:35:58 2008
+++ php-src/tests/security/open_basedir_file.phpt Sun Sep 7 22:35:15 2008
@@ -31,42 +31,42 @@

Warning: file(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(%s/test/bad/../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(%s/test/bad/../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
array(1) {
[0]=>
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file_get_contents.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/open_basedir_file_get_contents.phpt
diff -u php-src/tests/security/open_basedir_file_get_contents.phpt:1.1.2.1 php-src/tests/security/open_basedir_file_get_contents.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_file_get_contents.phpt:1.1.2.1 Fri May 9 08:35:57 2008
+++ php-src/tests/security/open_basedir_file_get_contents.phpt Sun Sep 7 22:35:15 2008
@@ -31,42 +31,42 @@

Warning: file_get_contents(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(%s/test/bad/../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(%s/test/bad/../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
string(12) "Hello World!"
string(12) "Hello World!"
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file_put_contents.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/open_basedir_file_put_contents.phpt
diff -u php-src/tests/security/open_basedir_file_put_contents.phpt:1.1.2.1 php-src/tests/security/open_basedir_file_put_contents.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_file_put_contents.phpt:1.1.2.1 Fri May 9 08:35:58 2008
+++ php-src/tests/security/open_basedir_file_put_contents.phpt Sun Sep 7 22:35:15 2008
@@ -31,27 +31,27 @@

Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File(.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(.././bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(.././bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(../bad/../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(../bad/../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File(./.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(./.././bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(./.././bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [file_put_contents] ***

http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_fopen.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/open_basedir_fopen.phpt
diff -u php-src/tests/security/open_basedir_fopen.phpt:1.1.2.1 php-src/tests/security/open_basedir_fopen.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_fopen.phpt:1.1.2.1 Fri May 9 08:35:58 2008
+++ php-src/tests/security/open_basedir_fopen.phpt Sun Sep 7 22:35:15 2008
@@ -40,42 +40,42 @@

Warning: fopen(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/./bad.txt): failed to open stream: Operation not permitted in %s on line 12
+Warning: fopen(../bad/./bad.txt): failed to open stream: %s in %s on line 12
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(./../.): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(./../.): failed to open stream: %s in %s on line %d
bool(false)
resource(%d) of type (stream)
resource(%d) of type (stream)
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_opendir.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/open_basedir_opendir.phpt
diff -u php-src/tests/security/open_basedir_opendir.phpt:1.1.2.1 php-src/tests/security/open_basedir_opendir.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_opendir.phpt:1.1.2.1 Fri May 9 08:35:57 2008
+++ php-src/tests/security/open_basedir_opendir.phpt Sun Sep 7 22:35:15 2008
@@ -29,42 +29,42 @@

Warning: opendir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../bad): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(..): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(..): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(/): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(/): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../bad/.): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)
resource(%d) of type (stream)
resource(%d) of type (stream)
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_scandir.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/open_basedir_scandir.phpt
diff -u php-src/tests/security/open_basedir_scandir.phpt:1.1.2.1 php-src/tests/security/open_basedir_scandir.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_scandir.phpt:1.1.2.1 Fri May 9 08:35:57 2008
+++ php-src/tests/security/open_basedir_scandir.phpt Sun Sep 7 22:35:15 2008
@@ -29,58 +29,58 @@

Warning: scandir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../bad): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../bad/bad.txt): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(..): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(..): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line 80

-Warning: scandir(../): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(/): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(/): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../bad/.): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)
array(3) {
[0]=>

johannes Sun Sep 7 22:35:15 2008 UTC

Modified files: (Branch: PHP_5_2)
/php-src/tests/security open_basedir_copy.phpt
open_basedir_dir.phpt
open_basedir_error_log_variation.phpt
open_basedir_file.phpt
open_basedir_file_get_contents.phpt
open_basedir_file_put_contents.phpt
open_basedir_fopen.phpt
open_basedir_opendir.phpt
open_basedir_scandir.phpt
Log:
- MFH: The exact error message might differ (it's "Not owner" on Solaris)

[PHP-CVS] cvs: php-src(PHP_5_3) /tests/security open_basedir_copy.phpt open_basedir_dir.phpt open_basedir_error_log_variation.phpt open_basedir_file.phpt open_basedir_file_get_contents.phpt open_basedir_file_put_contents.phpt open_basedir_fopen.phpt open_basedir_opendir.phpt open_basedir_scandir.phpt

2008-09-07T15:34:00.000-07:00

http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_copy.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/security/open_basedir_copy.phpt
diff -u php-src/tests/security/open_basedir_copy.phpt:1.1.4.2 php-src/tests/security/open_basedir_copy.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_copy.phpt:1.1.4.2 Fri May 9 08:39:44 2008
+++ php-src/tests/security/open_basedir_copy.phpt Sun Sep 7 22:34:39 2008
@@ -36,42 +36,42 @@

Warning: copy(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/./bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad/./bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(./../.): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(./../.): failed to open stream: %s in %s on line %d
bool(false)
bool(true)
bool(true)
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_dir.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/security/open_basedir_dir.phpt
diff -u php-src/tests/security/open_basedir_dir.phpt:1.1.4.2 php-src/tests/security/open_basedir_dir.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_dir.phpt:1.1.4.2 Fri May 9 08:39:44 2008
+++ php-src/tests/security/open_basedir_dir.phpt Sun Sep 7 22:34:39 2008
@@ -29,42 +29,42 @@

Warning: dir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../bad): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(..): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(..): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(/): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(/): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../bad/.): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)
object(Directory)#%d (2) {
["path"]=>
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_error_log_variation.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/security/open_basedir_error_log_variation.phpt
diff -u php-src/tests/security/open_basedir_error_log_variation.phpt:1.1.4.2 php-src/tests/security/open_basedir_error_log_variation.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_error_log_variation.phpt:1.1.4.2 Fri May 9 08:39:44 2008
+++ php-src/tests/security/open_basedir_error_log_variation.phpt Sun Sep 7 22:34:39 2008
@@ -31,17 +31,17 @@

Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: error_log(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/test/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: error_log(%s/test/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: error_log(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: error_log(%s/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
bool(true)
*** Finished testing open_basedir configuration [error_log] ***
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/security/open_basedir_file.phpt
diff -u php-src/tests/security/open_basedir_file.phpt:1.1.4.2 php-src/tests/security/open_basedir_file.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_file.phpt:1.1.4.2 Fri May 9 08:39:44 2008
+++ php-src/tests/security/open_basedir_file.phpt Sun Sep 7 22:34:39 2008
@@ -31,42 +31,42 @@

Warning: file(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(%s/test/bad/../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(%s/test/bad/../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
array(1) {
[0]=>
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file_get_contents.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/security/open_basedir_file_get_contents.phpt
diff -u php-src/tests/security/open_basedir_file_get_contents.phpt:1.1.4.2 php-src/tests/security/open_basedir_file_get_contents.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_file_get_contents.phpt:1.1.4.2 Fri May 9 08:39:44 2008
+++ php-src/tests/security/open_basedir_file_get_contents.phpt Sun Sep 7 22:34:39 2008
@@ -31,42 +31,42 @@

Warning: file_get_contents(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(%s/test/bad/../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(%s/test/bad/../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
string(12) "Hello World!"
string(12) "Hello World!"
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file_put_contents.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/security/open_basedir_file_put_contents.phpt
diff -u php-src/tests/security/open_basedir_file_put_contents.phpt:1.1.4.2 php-src/tests/security/open_basedir_file_put_contents.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_file_put_contents.phpt:1.1.4.2 Fri May 9 08:39:44 2008
+++ php-src/tests/security/open_basedir_file_put_contents.phpt Sun Sep 7 22:34:40 2008
@@ -31,27 +31,27 @@

Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File(.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(.././bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(.././bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(../bad/../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(../bad/../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File(./.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(./.././bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(./.././bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [file_put_contents] ***

http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_fopen.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/security/open_basedir_fopen.phpt
diff -u php-src/tests/security/open_basedir_fopen.phpt:1.1.4.2 php-src/tests/security/open_basedir_fopen.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_fopen.phpt:1.1.4.2 Fri May 9 08:39:44 2008
+++ php-src/tests/security/open_basedir_fopen.phpt Sun Sep 7 22:34:40 2008
@@ -40,42 +40,42 @@

Warning: fopen(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/./bad.txt): failed to open stream: Operation not permitted in %s on line 12
+Warning: fopen(../bad/./bad.txt): failed to open stream: %s in %s on line 12
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(./../.): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(./../.): failed to open stream: %s in %s on line %d
bool(false)
resource(%d) of type (stream)
resource(%d) of type (stream)
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_opendir.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/security/open_basedir_opendir.phpt
diff -u php-src/tests/security/open_basedir_opendir.phpt:1.1.4.2 php-src/tests/security/open_basedir_opendir.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_opendir.phpt:1.1.4.2 Fri May 9 08:39:44 2008
+++ php-src/tests/security/open_basedir_opendir.phpt Sun Sep 7 22:34:40 2008
@@ -29,42 +29,42 @@

Warning: opendir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../bad): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(..): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(..): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(/): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(/): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../bad/.): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)
resource(%d) of type (stream)
resource(%d) of type (stream)
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_scandir.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/tests/security/open_basedir_scandir.phpt
diff -u php-src/tests/security/open_basedir_scandir.phpt:1.1.4.2 php-src/tests/security/open_basedir_scandir.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_scandir.phpt:1.1.4.2 Fri May 9 08:39:44 2008
+++ php-src/tests/security/open_basedir_scandir.phpt Sun Sep 7 22:34:40 2008
@@ -29,58 +29,58 @@

Warning: scandir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../bad): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../bad/bad.txt): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(..): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(..): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line 80

-Warning: scandir(../): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(/): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(/): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../bad/.): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)
array(3) {
[0]=>

johannes Sun Sep 7 22:34:40 2008 UTC

Modified files: (Branch: PHP_5_3)
/php-src/tests/security open_basedir_copy.phpt
open_basedir_dir.phpt
open_basedir_error_log_variation.phpt
open_basedir_file.phpt
open_basedir_file_get_contents.phpt
open_basedir_file_put_contents.phpt
open_basedir_fopen.phpt
open_basedir_opendir.phpt
open_basedir_scandir.phpt
Log:
- MFH: The exact error message might differ (it's "Not owner" on Solaris)

[PHP-CVS] cvs: php-src /tests/security open_basedir_copy.phpt open_basedir_dir.phpt open_basedir_error_log_variation.phpt open_basedir_file.phpt open_basedir_file_get_contents.phpt open_basedir_file_put_contents.phpt open_basedir_fopen.phpt open_basedir_opendir.phpt open_basedir_parse_ini_file.phpt open_basedir_scandir.phpt

2008-09-07T15:33:00.000-07:00

http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_copy.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/security/open_basedir_copy.phpt
diff -u php-src/tests/security/open_basedir_copy.phpt:1.3 php-src/tests/security/open_basedir_copy.phpt:1.4
--- php-src/tests/security/open_basedir_copy.phpt:1.3 Mon May 26 15:52:05 2008
+++ php-src/tests/security/open_basedir_copy.phpt Sun Sep 7 22:33:38 2008
@@ -36,42 +36,42 @@

Warning: copy(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(../bad/./bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(../bad/./bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: copy(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d

-Warning: copy(./../.): failed to open stream: Operation not permitted in %s on line %d
+Warning: copy(./../.): failed to open stream: %s in %s on line %d
bool(false)
bool(true)
bool(true)
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_dir.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/security/open_basedir_dir.phpt
diff -u php-src/tests/security/open_basedir_dir.phpt:1.3 php-src/tests/security/open_basedir_dir.phpt:1.4
--- php-src/tests/security/open_basedir_dir.phpt:1.3 Mon May 26 15:52:05 2008
+++ php-src/tests/security/open_basedir_dir.phpt Sun Sep 7 22:33:38 2008
@@ -29,42 +29,42 @@

Warning: dir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../bad): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(..): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(..): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(/): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(/): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(../bad/.): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)
object(Directory)#%d (2) {
[u"path"]=>
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_error_log_variation.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/security/open_basedir_error_log_variation.phpt
diff -u php-src/tests/security/open_basedir_error_log_variation.phpt:1.3 php-src/tests/security/open_basedir_error_log_variation.phpt:1.4
--- php-src/tests/security/open_basedir_error_log_variation.phpt:1.3 Mon May 26 15:52:05 2008
+++ php-src/tests/security/open_basedir_error_log_variation.phpt Sun Sep 7 22:33:38 2008
@@ -31,17 +31,17 @@

Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: error_log(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/test/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: error_log(%s/test/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: error_log(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: error_log(%s/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: error_log(%s/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
bool(true)
*** Finished testing open_basedir configuration [error_log] ***
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/security/open_basedir_file.phpt
diff -u php-src/tests/security/open_basedir_file.phpt:1.3 php-src/tests/security/open_basedir_file.phpt:1.4
--- php-src/tests/security/open_basedir_file.phpt:1.3 Mon May 26 15:52:05 2008
+++ php-src/tests/security/open_basedir_file.phpt Sun Sep 7 22:33:38 2008
@@ -31,42 +31,42 @@

Warning: file(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file(%s/test/bad/../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file(%s/test/bad/../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
array(1) {
[0]=>
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file_get_contents.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/tests/security/open_basedir_file_get_contents.phpt
diff -u php-src/tests/security/open_basedir_file_get_contents.phpt:1.2 php-src/tests/security/open_basedir_file_get_contents.phpt:1.3
--- php-src/tests/security/open_basedir_file_get_contents.phpt:1.2 Fri May 9 08:44:43 2008
+++ php-src/tests/security/open_basedir_file_get_contents.phpt Sun Sep 7 22:33:38 2008
@@ -31,42 +31,42 @@

Warning: file_get_contents(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_get_contents(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_get_contents(%s/test/bad/../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_get_contents(%s/test/bad/../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
string(12) "Hello World!"
string(12) "Hello World!"
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file_put_contents.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/security/open_basedir_file_put_contents.phpt
diff -u php-src/tests/security/open_basedir_file_put_contents.phpt:1.3 php-src/tests/security/open_basedir_file_put_contents.phpt:1.4
--- php-src/tests/security/open_basedir_file_put_contents.phpt:1.3 Mon May 26 15:52:05 2008
+++ php-src/tests/security/open_basedir_file_put_contents.phpt Sun Sep 7 22:33:38 2008
@@ -31,26 +31,26 @@

Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File(.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(.././bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(.././bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File(../bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(../bad/../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(../bad/../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File(./.././bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents(./.././bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents(./.././bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: file_put_contents(): open_basedir restriction in effect. File%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)
*** Finished testing open_basedir configuration [file_put_contents] ***
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_fopen.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/security/open_basedir_fopen.phpt
diff -u php-src/tests/security/open_basedir_fopen.phpt:1.3 php-src/tests/security/open_basedir_fopen.phpt:1.4
--- php-src/tests/security/open_basedir_fopen.phpt:1.3 Mon May 26 15:52:05 2008
+++ php-src/tests/security/open_basedir_fopen.phpt Sun Sep 7 22:33:38 2008
@@ -40,42 +40,42 @@

Warning: fopen(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../bad): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../bad/bad.txt): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(..): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(..): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(/): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(/): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/.): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(../bad/.): failed to open stream: %s in %s on line %d
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(../bad/./bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(../bad/./bad.txt): failed to open stream: Operation not permitted in %s on line 12
+Warning: fopen(../bad/./bad.txt): failed to open stream: %s in %s on line 12
bool(false)

Warning: fopen(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d

-Warning: fopen(./../.): failed to open stream: Operation not permitted in %s on line %d
+Warning: fopen(./../.): failed to open stream: %s in %s on line %d
bool(false)
resource(%d) of type (stream)
resource(%d) of type (stream)
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_opendir.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/security/open_basedir_opendir.phpt
diff -u php-src/tests/security/open_basedir_opendir.phpt:1.3 php-src/tests/security/open_basedir_opendir.phpt:1.4
--- php-src/tests/security/open_basedir_opendir.phpt:1.3 Mon May 26 15:52:05 2008
+++ php-src/tests/security/open_basedir_opendir.phpt Sun Sep 7 22:33:38 2008
@@ -29,42 +29,42 @@

Warning: opendir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../bad): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(..): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(..): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(/): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(/): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(../bad/.): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)

Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: opendir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: opendir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d
bool(false)
resource(%d) of type (stream)
resource(%d) of type (stream)
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_parse_ini_file.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/security/open_basedir_parse_ini_file.phpt
diff -u php-src/tests/security/open_basedir_parse_ini_file.phpt:1.3 php-src/tests/security/open_basedir_parse_ini_file.phpt:1.4
--- php-src/tests/security/open_basedir_parse_ini_file.phpt:1.3 Mon May 26 15:52:05 2008
+++ php-src/tests/security/open_basedir_parse_ini_file.phpt Sun Sep 7 22:33:38 2008
@@ -39,43 +39,43 @@

Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test\bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: parse_ini_file(%s\test\bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: parse_ini_file(%s\test\bad): failed to open stream: %s in %s on line %d
array(0) {
}

Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test\bad\bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: parse_ini_file(%s\test\bad\bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: parse_ini_file(%s\test\bad\bad.txt): failed to open stream: %s in %s on line %d
array(0) {
}

Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test) is not within the allowed path(s): (.) in %s on line %d

-Warning: parse_ini_file(%s\test): failed to open stream: Operation not permitted in %s on line %d
+Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
array(0) {
}

Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test) is not within the allowed path(s): (.) in %s on line %d

-Warning: parse_ini_file(%s\test): failed to open stream: Operation not permitted in %s on line %d
+Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
array(0) {
}

Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test\bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: parse_ini_file(%s\test\bad): failed to open stream: Operation not permitted in %s on line %d
+Warning: parse_ini_file(%s\test\bad): failed to open stream: %s in %s on line %d
array(0) {
}

Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test\bad\bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: parse_ini_file(%s\test\bad\bad.txt): failed to open stream: Operation not permitted in %s on line %d
+Warning: parse_ini_file(%s\test\bad\bad.txt): failed to open stream: %s in %s on line %d
array(0) {
}

Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test) is not within the allowed path(s): (.) in %s on line %d

-Warning: parse_ini_file(%s\test): failed to open stream: Operation not permitted in %s on line %d
+Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
array(0) {
}
*** Finished testing open_basedir configuration [parse_ini_file] ***
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_scandir.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/security/open_basedir_scandir.phpt
diff -u php-src/tests/security/open_basedir_scandir.phpt:1.3 php-src/tests/security/open_basedir_scandir.phpt:1.4
--- php-src/tests/security/open_basedir_scandir.phpt:1.3 Mon May 26 15:52:05 2008
+++ php-src/tests/security/open_basedir_scandir.phpt Sun Sep 7 22:33:38 2008
@@ -29,58 +29,58 @@

Warning: scandir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../bad): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../bad/bad.txt): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(..): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(..): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line 80

-Warning: scandir(../): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(/): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(/): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(../bad/.): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(../bad/.): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(%s/test/bad/bad.txt): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)

Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d

-Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
+Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: %s in %s on line %d

-Warning: scandir(): (errno 1): Operation not permitted in %s on line %d
+Warning: scandir(): (errno 1): %s in %s on line %d
bool(false)
array(3) {
[0]=>

johannes Sun Sep 7 22:33:38 2008 UTC

Modified files:
/php-src/tests/security open_basedir_copy.phpt
open_basedir_dir.phpt
open_basedir_error_log_variation.phpt
open_basedir_file.phpt
open_basedir_file_get_contents.phpt
open_basedir_file_put_contents.phpt
open_basedir_fopen.phpt
open_basedir_opendir.phpt
open_basedir_parse_ini_file.phpt
open_basedir_scandir.phpt
Log:
- The exact error message might differ (it's "Not owner" on Solaris)

Re: [PHP-DB] If( Query)

2008-09-07T15:03:00.000-07:00

Niel Archer wrote:
> Hi
>
>
>> I have the following function:
>>
>> function
>> add_item($item_name,$item_desc,$item_price,$item_man_id,$item_cat_id,$item_pix)
>> {
>> connect();
>> if($item_pix == "")
>> {
>> $sql = "INSERT INTO items
>> (item_name,item_desc,item_price,item_man_id,item_cat_id) VALUES
>> ('$item_name','$item_desc','$item_price','$item_man_id','$item_cat_id')";
>> }
>> else {
>> $sql = "INSERT INTO items
>> (item_name,item_desc,item_price,item_pix,item_man_id,item_cat_id) VALUES
>> ('$item_name','$item_desc','$item_price','$item_pix','$item_man_id','$item_cat_id')";
>> }
>> mysql_query($sql);
>> return;
>> }
>>
>> I am using the if statement because i want it so that if no picture is
>> uploaded the entry is blank and the mysql database has a default entry
>> of na.gif which is a "picture coming soon picture".
>>
>> It works fine when i run in localy on MAMP, but if i run it on my web
>> server it doesnt add the row.
>>
>
> You should be checking the mysql_query call for success and output the
> error if it fails. Something like:
>
> mysql_query($sql) or die('Insert failed: ' . mysql_error());
>
> You'll now why it's failing then. Make sure you have error reporting
> enabled.
>
>
>> Is this a compatability error? or is there a better way to write this?
>>
>>
>
>
> --
> Niel Archer
>
>
>
>
I have fixed it now:

Thanks anyway.

--
PHP Database Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DB] If( Query)

2008-09-07T14:58:00.000-07:00

> I have the following function:
>
> function
> add_item($item_name,$item_desc,$item_price,$item_man_id,$item_cat_id,$item_pix)
> {
> connect();
> if($item_pix == "")
> {
> $sql = "INSERT INTO items
> (item_name,item_desc,item_price,item_man_id,item_cat_id) VALUES
> ('$item_name','$item_desc','$item_price','$item_man_id','$item_cat_id')";
> }
> else {
> $sql = "INSERT INTO items
> (item_name,item_desc,item_price,item_pix,item_man_id,item_cat_id) VALUES
> ('$item_name','$item_desc','$item_price','$item_pix','$item_man_id','$item_cat_id')";
> }
> mysql_query($sql);
> return;
> }
>
> I am using the if statement because i want it so that if no picture is
> uploaded the entry is blank and the mysql database has a default entry
> of na.gif which is a "picture coming soon picture".
>
> It works fine when i run in localy on MAMP, but if i run it on my web
> server it doesnt add the row.

You should be checking the mysql_query call for success and output the
error if it fails. Something like:

mysql_query($sql) or die('Insert failed: ' . mysql_error());

You'll now why it's failing then. Make sure you have error reporting
enabled.

> Is this a compatability error? or is there a better way to write this?
>

--
Niel Archer

--
PHP Database Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DB] mysql auto_increment

2008-09-07T14:52:00.000-07:00

Little change - the label was not used in the right way:

http://pastebin.com/m2d98e677

On Sun, Sep 7, 2008 at 11:46 PM, Evert Lammerts
<evert.lammerts@gmail.com> wrote:
> I guess this code was not copy pasted from your actual source? It
> would generate mysql errors.
>
> Anyway, I think I've an idea of what you want, so here's my two cents :
>
> function edit_cat_radio($item_cat_id) {
> connect();
> $query = mysql_query("SELECT * FROM cat");
> while ($row = mysql_fetch_assoc($query)) {
> echo "<label for=\"{$row['cat_name']}\">{$row['cat_name']}<input
> type=\"radio\" name=\"fcat\" value=\"{$row['cat_id']}\"
> id=\"{$row['cat_id']}\" " . ($item_cat_id == $row["cat_id"] ?
> "checked=\"checked\"" : "") . "/>\n";
> }
> }
>
>
>
> On Sun, Sep 7, 2008 at 11:16 PM, Chris Hale <php@chrishale.co.uk> wrote:
>> I am writing a catologe application and i have a problem when it comes to
>> the edit product part. I have a table with the catogories and a table with
>> manufacturers.
>> Each table has a id column and a name column. The id column is set up in the
>> MySQL to auto_increment, which works fine normally, but i am writing this
>> script:
>>
>> function edit_cat_radio($item_cat_id)
>> {
>> connect();
>> $sql = "SELECT * FROM cat DISTINGT ORDER BY cat_id";
>> $result = mysql_query($sql);
>> $k = 1;
>> while ($row = mysql_fetch_assoc($result))
>> {
>> extract($row);
>> echo '<label for="',$cat_name,'">',$cat_name,'<input type="radio"
>> name="fcat" value="',$cat_id,'" id="',$cat_id,'"';
>> if($k == $item_cat_id)
>> {
>> echo 'checked';
>> }
>> echo ' />';
>> $k++;
>> }
>> return; }
>>
>> This should (in theory) automatically check the radio button of the existing
>> catogory. It would work fine; but what seems to mess it up is the
>> auto_increment.
>>
>> If i delete a catogory/manufacturer from the id's remain the same. and end
>> up like this:
>> cat_id cat_name
>> 1 Bridlework
>> 2 Clippers
>> 3 Clothing
>> 4 Dressage Tests
>> 5 DVD/Video/Books
>> 9 Footwear
>>
>> but if the cat_id is 9 the /while /statement doesnt repeat 9 times so the
>> counter never reaches 9.
>>
>> I don't know if you got all that, its hard to explain.
>>
>> I would appreciate any help on how to sort this out.
>>
>> Thanks
>>
>> --
>> PHP Database Mailing List (http://www.php.net/)
>> To unsubscribe, visit: http://www.php.net/unsub.php
>>
>>
>

--
PHP Database Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DB] mysql auto_increment

2008-09-07T14:49:00.000-07:00

Pastebin is so much nicer when posting code. Find the code i've sent here:

http://pastebin.com/mc5d611a

--
PHP Database Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DB] mysql auto_increment

2008-09-07T14:46:00.000-07:00

I guess this code was not copy pasted from your actual source? It
would generate mysql errors.

Anyway, I think I've an idea of what you want, so here's my two cents :

On Sun, Sep 7, 2008 at 11:16 PM, Chris Hale <php@chrishale.co.uk> wrote:
> I am writing a catologe application and i have a problem when it comes to
> the edit product part. I have a table with the catogories and a table with
> manufacturers.
> Each table has a id column and a name column. The id column is set up in the
> MySQL to auto_increment, which works fine normally, but i am writing this
> script:
>
> function edit_cat_radio($item_cat_id)
> {
> connect();
> $sql = "SELECT * FROM cat DISTINGT ORDER BY cat_id";
> $result = mysql_query($sql);
> $k = 1;
> while ($row = mysql_fetch_assoc($result))
> {
> extract($row);
> echo '<label for="',$cat_name,'">',$cat_name,'<input type="radio"
> name="fcat" value="',$cat_id,'" id="',$cat_id,'"';
> if($k == $item_cat_id)
> {
> echo 'checked';
> }
> echo ' />';
> $k++;
> }
> return; }
>
> This should (in theory) automatically check the radio button of the existing
> catogory. It would work fine; but what seems to mess it up is the
> auto_increment.
>
> If i delete a catogory/manufacturer from the id's remain the same. and end
> up like this:
> cat_id cat_name
> 1 Bridlework
> 2 Clippers
> 3 Clothing
> 4 Dressage Tests
> 5 DVD/Video/Books
> 9 Footwear
>
> but if the cat_id is 9 the /while /statement doesnt repeat 9 times so the
> counter never reaches 9.
>
> I don't know if you got all that, its hard to explain.
>
> I would appreciate any help on how to sort this out.
>
> Thanks
>
> --
> PHP Database Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>

--
PHP Database Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] Re[2]: Path of the class file of an object

2008-09-07T14:44:00.000-07:00

Hi,

I guess the word "meaningless" depends on what you are trying to do.

So, I guess I have to describe what I'm trying to do. The problem is, I need
to pass a php object to javascript via json and then back to php again
using json. However, while doing that, I lose the type of the object
(because json_encode method or json_decode works independent from the
object's class). Thus, I somehow need to typecast. I thought I might hold
class name as a property of the object so it would be passed inside json,
but type casting would work if and only if I have class file of the object
included.

In case I add a "getClassPath()" like variable to each php class, it would
be a great mess. Moreover, what I'm trying to do is developing a framework.
Thus, I don't want to force my users to alter their classes and their
behaviours.

This was my solution to keep the type persistent.

However, I would also thankfully appreciate if you have an idea to do that
in a better way.

thanks,

Ali.

On Sun, Sep 7, 2008 at 5:35 AM, ANR Daemon <anrdaemon@freemail.ru> wrote:

> Greetings, "Ali Çevik".
> In reply to Your message dated Sunday, September 7, 2008, 1:51:33,
>
> >>>> I need a procedure or an implementation that gives path of the class
> file
> >>>> of
> >>>> an object which I pass as a parameter.
> >>>>
> >>>> Example;
> >>>>
> >>>> Assume I have a class file located at C:\htdocs\Foo.class.php
> >>>>
> >>>> In code after I include Foo.class.php;
> >>>>
> >>>> <?php
> >>>> $foo = new Foo();
> >>>> Echo some_procedure($foo);
> >>>> ?>
> >>>>
> >>>> I'm looking an implementation for that "some_procedure", which would
> make
> >>>> this program to print C:\htdocs\Foo.class.php .
> >>>> I have been googling around and also checked php.net but I wasn't
> able
> >>>> to
> >>>> find anything about this subject.
> >>>>
> >>>> It would be really helpful if someone knows that kind of procedure or
> at
> >>>> least has an implementation of it.
> >>>>
> >>>
> >>> The only way I know to do this would be to add a method to your class
> to
> >>> give it to you.
> >>>
> >>> class Foo
> >>> {
> >>> public function getClassFilename()
> >>> {
> >>> return __FILE__;
> >>> }
> >>> }
>
> > Hmm, that should do the trick. Thanks a lot!
> > But still, I wish there were a way of doing that, without altering
> the
> > class behaviour.
>
> (top posting fixed)
>
> Ok, if you prefer backward solution - hook your own error-handler and cause
> an
> error in class, then you'll have path to it's file in backtrace.
> I mean, knowing the filename of this or that function absolutely
> meaningless,
> unless you're running into problem of some sort.
>
>
> --
> Sincerely Yours, ANR Daemon <anrdaemon@freemail.ru>
>
>
> --
> PHP General Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>

Re: [PHP] php image and javascript include

2008-09-07T14:38:00.000-07:00

b wrote:
> javasac wrote:
>> [lots of stuff ...]

> Second, at least one of the image paths is relative to your own desktop
> computer's drive (why is it that this always happens on a Windows box?)
>
> > <td width="11">
> > C:/wamp/www/yojoe-web/html/site/images/box_top_rht.jpg </td>

PEBKAC error? I've seen it happen when an inexperienced developer
copied a file to another location, from within Dreamweaver, on a
Mac. Dreamweaver updates the file path(s) if permitted and depending
on a couple of variables, puts in an absolute path to the location
on that particular machine.

Reese

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-DB] mysql auto_increment

2008-09-07T14:16:00.000-07:00

I am writing a catologe application and i have a problem when it comes
to the edit product part. I have a table with the catogories and a table
with manufacturers.
Each table has a id column and a name column. The id column is set up in
the MySQL to auto_increment, which works fine normally, but i am writing
this script:

This should (in theory) automatically check the radio button of the
existing catogory. It would work fine; but what seems to mess it up is
the auto_increment.

If i delete a catogory/manufacturer from the id's remain the same. and
end up like this:
cat_id cat_name
1 Bridlework
2 Clippers
3 Clothing
4 Dressage Tests
5 DVD/Video/Books
9 Footwear

but if the cat_id is 9 the /while /statement doesnt repeat 9 times so
the counter never reaches 9.

I don't know if you got all that, its hard to explain.

I would appreciate any help on how to sort this out.

Thanks

--
PHP Database Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

2008-09-07T14:03:00.001-07:00

Hi Jani

2008/9/7 Jani Taskinen <jani.taskinen@sci.fi>

> Pierre Joye kirjoitti:
>
>> hi Bjori,
>>
>> On Sun, Sep 7, 2008 at 3:44 PM, Hannes Magnusson
>> <hannes.magnusson@gmail.com> wrote:
>>
>> I don't understand...
>>> Does arg_separator.output="&" in php.ini not work on windows - or
>>> is this a bug in run-tests.php?
>>>
>>
>> It does not. run-tests should take care of escaping the cmd line
>> arguments arguments using escapeshellargs. We can then use:
>>
>> inisetting=&
>>
>> instead of
>>
>> inisetting="&"
>>
>> Especially as " is not always portable.
>>
>
> Just use single quotes then.. where the hell isn't " portable? Windows?
> What in this isn't portable???

Windows uses double quotes on command line for php, eg. this will result in
a parse error (Unexpected character in input (ASCII=39):
php -r 'echo test;'

However the following works:
php -r "echo test;"
I don't know what, why ect. but inside run-tests.php (as Pierre said) using
double
quotes in INI section will break out of the string generated by
settings2params()
in run-tests.php and try to execute another command, since it breaks out on
020.phpt
in session it will generate two popups (MessageBox()) calls saying Invalid
configuration
directive.

I asked Felipe on IRC and he said the test didn't break without quotes on
Linux. But either
way this needs to be fixed insted of this work-a-around.

>
>
> --Jani
>

Cheers

--
Kalle Sommer Nielsen

Re: [PHP] php image and javascript include

2008-09-07T13:58:00.000-07:00

Reese schreef:
> b wrote:
>> javasac wrote:
>>> [lots of stuff ...]
>
>> Second, at least one of the image paths is relative to your own
>> desktop computer's drive (why is it that this always happens on a
>> Windows box?)
>>
>> > <td width="11">
>> > C:/wamp/www/yojoe-web/html/site/images/box_top_rht.jpg </td>
>
> PEBKAC error? I've seen it happen when an inexperienced developer
> copied a file to another location, from within Dreamweaver, on a
> Mac. Dreamweaver updates the file path(s) if permitted and depending
> on a couple of variables, puts in an absolute path to the location
> on that particular machine.

at the opposite end of the stick you have Eclipse users (mac or otherwise)
whose machines freeze up when moving or renaming stuff as Eclipse tries to
refactor code that references the resource. It's no wonder that dreamweaver
screws such stuff up ... with Eclipse you seem to have to sell your soul in
order get the arcane settings related to these kinds of 'productivity' tools
even close to working.

mines the one with 'not for sale' on the back.

> Reese
>
>

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[DOC-CVS] cvs: phpdoc /da preface.xml translation.xml

2008-09-07T13:41:00.000-07:00

kalle Sun Sep 7 20:41:59 2008 UTC

Added files:
/phpdoc/da preface.xml translation.xml
Log:
Translated preface and created the new translation.xml file

http://cvs.php.net/viewvc.cgi/phpdoc/da/preface.xml?view=markup&rev=1.1
Index: phpdoc/da/preface.xml
+++ phpdoc/da/preface.xml
<?xml version="1.0" encoding="iso-8859-1"?>

<preface xml:id="preface" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook">
<info>
<title>Forord</title>
<abstract>
<simpara>
<acronym>PHP</acronym>, som står for "PHP: Hypertext
Preprocessor" er et udbredt Open Source scriptsprog til
generelle formål, men er specielt tilpasset til web
udvikling og kan integreres med HTML. Syntaksen ligner C,
Java og Perl, og er nem at lære. Hovedmålet med sproget er
at lade web udviklere skrive dynamisk genereret hjemmesider
hurtigt, men du kan også gøre meget mere med PHP.
</simpara>
</abstract>
</info>

<para>
Denne manual består primært af en <link linkend="funcref">
funktions reference</link>, men indeholder også en
<link linkend="langref">sprog reference</link>, forklaringer
af nogle af PHP's primære <link linkend="features">features</link>,
og andre <link linkend="appendices">supplerende</link> oplysninger.
</para>
<para>
Du kan downloade denne manual i flere formater på
<link xlink:href="&url.php.doc.downloads;">&url.php.doc.downloads;</link>.
Mere information om hvordan denne manual er udviklet kan blive fundet på
<link linkend="about">'Om manualen'</link> afsnittet. Hvis du er
interesseret i <link linkend="history">PHP's historie</link>, så
kan du besøge det relevante afsnit.
</para>

&contributors;
</preface>

http://cvs.php.net/viewvc.cgi/phpdoc/da/translation.xml?view=markup&rev=1.1
Index: phpdoc/da/translation.xml
+++ phpdoc/da/translation.xml
<?xml version="1.0" encoding="iso-8859-1" ?>
<!DOCTYPE translation SYSTEM "../dtds/translation.dtd">

<intro>
Velkommen til den danske oversættelse af PHP Manualen. Oversættelsen er styret af
Kalle Sommer Nielsen (kalle) og Peter Emil Henriksen (rmlr) samt de resterende brugere
med CVS adgang. Vi modtager gerne patches og anden form for hjælp til oversættelsen. Du
kan skrive til vores mailing liste hvis du har spørgsmål på: doc-da@lists.php.net eller
tilmelde dig listen ved at skrive til doc-da-subscribe@lists.php.net. Du kan også læse
vores mailingliste from vores NNTP gateway <a href="http://news.php.net/php.doc.da">her</a>.
</intro>

<chmindex>
Denne fil blev genereret: <datetime /><br />
Gå til <a href="http://www.php.net/download-docs">http://www.php.net/download-docs</a>
for den seneste version.
</chmindex>

</translation>

--
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/fileinfo fileinfo.c /ext/fileinfo/libmagic apprentice.c compress.c file.h fsmagic.c funcs.c magic.c magic.h /ext/fileinfo/tests finfo_file_001.phpt mime_content_type_001.phpt

2008-09-07T13:29:00.000-07:00

http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.31&r2=1.32&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.31 php-src/ext/fileinfo/fileinfo.c:1.32
--- php-src/ext/fileinfo/fileinfo.c:1.31 Fri Aug 29 15:17:25 2008
+++ php-src/ext/fileinfo/fileinfo.c Sun Sep 7 20:29:54 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: fileinfo.c,v 1.31 2008/08/29 15:17:25 felipe Exp $ */
+/* $Id: fileinfo.c,v 1.32 2008/09/07 20:29:54 felipe Exp $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -38,6 +38,10 @@
#include "php_fileinfo.h"
#include "fopen_wrappers.h" /* needed for is_url */

+#ifndef _S_IFDIR
+# define _S_IFDIR S_IFDIR
+#endif
+
/* {{{ macros and type definitions */
struct php_fileinfo {
long options;
@@ -405,87 +409,164 @@
}
/* }}} */

-static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
+#define FILEINFO_MODE_BUFFER 0
+#define FILEINFO_MODE_STREAM 1
+#define FILEINFO_MODE_FILE 2
+
+static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mimetype_emu) /* {{{ */
{
long options = 0;
- char *tmp, *ret_val, *buffer = NULL;
+ char *ret_val = NULL, *buffer = NULL;
int buffer_len;
struct php_fileinfo *finfo;
zval *zfinfo, *zcontext = NULL;
+ zval *what;
+ char mime_directory[] = "directory";
+
+ struct magic_set *magic = NULL;
FILEINFO_DECLARE_INIT_OBJECT(object)

- if (object) {
+ if (mimetype_emu) {
+
+ /* mime_content_type(..) emulation */
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &what) == FAILURE) {
+ return;
+ }
+
+ switch (Z_TYPE_P(what)) {
+ case IS_UNICODE:
+ case IS_STRING:
+ if (Z_TYPE_P(what) == IS_UNICODE) {
+ convert_to_string_ex(&what);
+ }
+
+ buffer = Z_STRVAL_P(what);
+ buffer_len = Z_STRLEN_P(what);
+ mode = FILEINFO_MODE_FILE;
+ break;
+
+ case IS_RESOURCE:
+ mode = FILEINFO_MODE_STREAM;
+ break;
+
+ default:
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can only process string or stream arguments");
+ RETURN_FALSE;
+ }
+
+ magic = magic_open(MAGIC_MIME);
+ if (magic_load(magic, NULL) == -1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to load magic database.");
+ goto common;
+ }
+ } else if (object) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lr", &buffer, &buffer_len, &options, &zcontext) == FAILURE) {
RETURN_FALSE;
}
FILEINFO_FROM_OBJECT(finfo, object);
+ magic = finfo->magic;
} else {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|lr", &zfinfo, &buffer, &buffer_len, &options, &zcontext) == FAILURE) {
RETURN_FALSE;
}
ZEND_FETCH_RESOURCE(finfo, struct php_fileinfo *, &zfinfo, -1, "file_info", le_fileinfo);
+ magic = finfo->magic;
}

/* Set options for the current file/buffer. */
if (options) {
- FINFO_SET_OPTION(finfo->magic, options)
+ FINFO_SET_OPTION(magic, options)
}

- if (mode) { /* file */
- /* determine if the file is a local file or remote URL */
- char *tmp2;
- php_stream_wrapper *wrap = php_stream_locate_url_wrapper(buffer, &tmp2, 0 TSRMLS_CC);
- if (wrap && wrap->is_url) {
-#ifdef ZEND_ENGINE_2
- php_stream_context *context = php_stream_context_from_zval(zcontext, 0);
-#else
- php_stream_context *context = NULL;
-#endif
- php_stream *stream = php_stream_open_wrapper_ex(buffer, "rb",
- ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
- if (!stream) {
- RETURN_FALSE;
+ switch (mode) {
+ case FILEINFO_MODE_BUFFER:
+ {
+ ret_val = (char *) magic_buffer(magic, buffer, buffer_len);
+ break;
+ }
+
+ case FILEINFO_MODE_STREAM:
+ {
+ php_stream *stream;
+ off_t streampos;
+
+ php_stream_from_zval_no_verify(stream, &what);
+ if (!stream) {
+ goto common;
+ }
+
+ streampos = php_stream_tell(stream); /* remember stream position for restoration */
+ php_stream_seek(stream, 0, SEEK_SET);
+
+ ret_val = (char *) magic_stream(magic, stream);
+ break;
+ }
+
+ case FILEINFO_MODE_FILE:
+ {
+ /* determine if the file is a local file or remote URL */
+ char *tmp2;
+ php_stream_wrapper *wrap;
+ struct stat sb;
+
+ if (buffer == NULL || !*buffer) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty filename or path");
+ RETVAL_FALSE;
+ goto clean;
}
- buffer_len = php_stream_copy_to_mem(stream, &tmp, HOWMANY, 0);
- php_stream_close(stream);

- if (buffer_len == 0) {
- RETURN_FALSE;
+ if (php_sys_stat(buffer, &sb) == 0) {
+ if (sb.st_mode & _S_IFDIR) {
+ ret_val = mime_directory;
+ goto common;
+ }
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "File or path not found '%s'", buffer);
+ RETVAL_FALSE;
+ goto clean;
}
- } else { /* local file */
- char resolved_path[MAXPATHLEN];
+ wrap = php_stream_locate_url_wrapper(buffer, &tmp2, 0 TSRMLS_CC);
+
+ if (wrap) {
+ php_stream_context *context = php_stream_context_from_zval(zcontext, 0);
+
+ php_stream *stream = php_stream_open_wrapper_ex(buffer, "rb", REPORT_ERRORS, NULL, context);

- if (*buffer && VCWD_REALPATH(buffer, resolved_path)) {
- if (php_check_open_basedir(resolved_path TSRMLS_CC)) {
- RETURN_FALSE;
+ if (!stream) {
+ if (mimetype_emu) {
+ magic_close(magic);
+ }
+ RETVAL_FALSE;
+ goto clean;
}
- ret_val = (char *) magic_file(finfo->magic, resolved_path);
- } else {
- RETURN_FALSE;
+
+ ret_val = magic_stream(magic, stream);
+ php_stream_close(stream);
}
- goto common;
+ break;
}
- } else { /* buffer */
- tmp = buffer;
+ default:
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can only process string or stream arguments");
+ }
+
+common:
+ if (ret_val) {
+ RETVAL_STRING(ret_val, 1);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed identify data %d:%s", magic_errno(magic), magic_error(magic));
+ RETVAL_FALSE;
}

- ret_val = (char *) magic_buffer(finfo->magic, tmp, buffer_len);
- if (mode) {
- efree(tmp);
+clean:
+ if (mimetype_emu) {
+ magic_close(magic);
}
-common:
+
/* Restore options */
if (options) {
- FINFO_SET_OPTION(finfo->magic, finfo->options)
- }
-
- if (!ret_val) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed identify data %d:%s",
- magic_errno(finfo->magic), magic_error(finfo->magic));
- RETURN_FALSE;
- } else {
- RETURN_STRING(ret_val, 1);
+ FINFO_SET_OPTION(magic, finfo->options)
}
+ return;
}
/* }}} */

@@ -493,7 +574,7 @@
Return information about a file. */
PHP_FUNCTION(finfo_file)
{
- _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+ _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, FILEINFO_MODE_FILE, 0);
}
/* }}} */

@@ -501,7 +582,7 @@
Return infromation about a string buffer. */
PHP_FUNCTION(finfo_buffer)
{
- _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+ _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, FILEINFO_MODE_BUFFER, 0);
}
/* }}} */

@@ -509,90 +590,7 @@
Return content-type for file */
PHP_FUNCTION(mime_content_type)
{
- zval *what;
- magic_t magic;
- char *tmp, *ret_val;
- int buffer_len;
- char *tmp2;
- php_stream_wrapper *wrap;
- zval *zcontext = NULL;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &what) == FAILURE) {
- return;
- }
-
- RETVAL_FALSE;
-
- magic = magic_open(MAGIC_MIME);
- if (magic_load(magic, NULL) == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to load magic database.");
- goto cleanup;
- }
-
- switch (Z_TYPE_P(what)) {
- case IS_STRING:
- wrap = php_stream_locate_url_wrapper(Z_STRVAL_P(what), &tmp2, 0 TSRMLS_CC);
- /* determine if the file is a local file or remote URL */
- if (wrap && wrap->is_url) {
- php_stream_context *context = php_stream_context_from_zval(zcontext, 0);
- php_stream *stream = php_stream_open_wrapper_ex(Z_STRVAL_P(what), "rb",
- ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
- if (!stream) {
- goto cleanup;
- }
- buffer_len = php_stream_copy_to_mem(stream, &tmp, 4096, 0);
- php_stream_close(stream);
-
- if (buffer_len == 0) {
- goto cleanup;
- }
- ret_val = (char *) magic_buffer(magic, tmp, buffer_len);
- } else { /* local file */
- char resolved_path[MAXPATHLEN];
-
- if (*Z_STRVAL_P(what) && VCWD_REALPATH(Z_STRVAL_P(what), resolved_path)) {
- if (php_check_open_basedir(resolved_path TSRMLS_CC)) {
- goto cleanup;
- }
- ret_val = (char *) magic_file(magic, resolved_path);
- } else {
- goto cleanup;
- }
- }
- break;
- case IS_RESOURCE:
- {
- php_stream *stream;
- off_t streampos;
-
- php_stream_from_zval_no_verify(stream, &what);
- if (!stream) {
- goto cleanup;
- }
- streampos = php_stream_tell(stream); /* remember stream position for restoration */
- php_stream_seek(stream, 0, SEEK_SET);
-
- buffer_len = php_stream_copy_to_mem(stream, &tmp, 4096, 0);
- php_stream_seek(stream, streampos, SEEK_SET);
-
- if (buffer_len == 0) {
- goto cleanup;
- }
- ret_val = (char *) magic_buffer(magic, tmp, buffer_len);
- }
- break;
- default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can only process string or stream arguments");
- goto cleanup;
- }
- if (!ret_val) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed identify data %d:%s",
- magic_errno(magic), magic_error(magic));
- } else {
- RETVAL_STRING(ret_val, 1);
- }
-cleanup:
- magic_close(magic);
+ _php_finfo_get_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, -1, 1);
}
/* }}} */

http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.10 php-src/ext/fileinfo/libmagic/apprentice.c:1.11
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.10 Fri Aug 29 12:05:35 2008
+++ php-src/ext/fileinfo/libmagic/apprentice.c Sun Sep 7 20:29:54 2008
@@ -29,21 +29,32 @@
* apprentice - make one pass through /etc/magic, learning its secrets.
*/

+#include "php.h"
+
#include "file.h"
#include "magic.h"
#include "patchlevel.h"
#include <stdlib.h>
-//#ifdef HAVE_UNISTD_H
+
+#ifdef PHP_WIN32
+#include "win32/unistd.h"
+#define strtoull _strtoui64
+#else
#include <unistd.h>
-//#endif
+#endif
+
#include <string.h>
#include <assert.h>
#include <ctype.h>
#include <fcntl.h>
#include <sys/stat.h>
+#ifndef PHP_WIN32
#include <sys/param.h>
+#endif
#include <sys/types.h>
+#ifndef PHP_WIN32
#include <dirent.h>
+#endif

#ifndef lint
FILE_RCSID("@(#)$File: apprentice.c,v 1.132 2008/03/28 18:19:30 christos Exp $")
@@ -174,6 +185,10 @@
# undef XX_NULL
};

+#ifndef S_ISDIR
+#define S_ISDIR(mode) ((mode) & _S_IFDIR)
+#endif
+
private int
get_type(const char *l, const char **t)
{
@@ -528,30 +543,41 @@
load_1(struct magic_set *ms, int action, const char *fn, int *errs,
struct magic_entry **marray, uint32_t *marraycount)
{
- char line[BUFSIZ];
+ zstr buffer;
+ char *line;
+ size_t line_len;
size_t lineno = 0;
- FILE *f = fopen(ms->file = fn, "r");
- if (f == NULL) {
+
+ php_stream *stream;
+
+ TSRMLS_FETCH();
+
+#if (PHP_MAJOR_VERSION < 6)
+ stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+#else
+ stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS, NULL);
+#endif
+ if (stream == NULL) {
if (errno != ENOENT)
file_error(ms, errno, "cannot read magic file `%s'",
fn);
(*errs)++;
} else {
- /* read and parse this file */
- for (ms->line = 1; fgets(line, sizeof(line), f) != NULL; ms->line++) {
- size_t len;
- len = strlen(line);
- if (len == 0) /* null line, garbage, etc */
+ buffer.v = emalloc(BUFSIZ+1);
+ for (ms->line = 1; (line = php_stream_get_line(stream, buffer, BUFSIZ, &line_len)) != NULL; ms->line++) {
+ if (line_len == 0 || /* null line, garbage, etc */
+ line[0] == '\0' || /* empty*/
+ line[0] == '#' || /* comment */
+ line[0] == '\n' || line[0] == '\r') { /* New Line */
continue;
- if (line[len - 1] == '\n') {
+ }
+
+ if (line[line_len - 1] == '\n') {
lineno++;
- line[len - 1] = '\0'; /* delete newline */
+ line[line_len - 1] = '\0'; /* delete newline */
}
- if (line[0] == '\0') /* empty, do not parse */
- continue;
- if (line[0] == '#') /* comment, do not parse */
- continue;
- if (len > mime_marker_len &&
+
+ if (line_len > mime_marker_len &&
memcmp(line, mime_marker, mime_marker_len) == 0) {
/* MIME type */
if (parse_mime(ms, marray, marraycount,
@@ -562,8 +588,8 @@
if (parse(ms, marray, marraycount, line, lineno, action) != 0)
(*errs)++;
}
-
- (void)fclose(f);
+ efree(buffer.v);
+ php_stream_close(stream);
}
}

@@ -585,7 +611,7 @@

ms->flags |= MAGIC_CHECK; /* Enable checks for parsed files */

- maxmagic = MAXMAGIS;
+ maxmagic = MAXMAGIS;
marray = ecalloc(maxmagic, sizeof(*marray));
marraycount = 0;

@@ -594,7 +620,7 @@
(void)fprintf(stderr, "%s\n", usg_hdr);

/* load directory or file */
- if (stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
+ if (php_sys_stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
dir = opendir(fn);
if (dir) {
while ((d = readdir(dir))) {
@@ -1816,17 +1842,20 @@
apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
const char *fn)
{
- int fd;
- struct stat st;
uint32_t *ptr;
uint32_t version;
int needsbyteswap;
char *dbname = NULL;
void *mm = NULL;
int ret = 0;
+ php_stream *stream;
+ php_stream_statbuf st;
+
+
+ TSRMLS_FETCH();

if (fn == NULL) {
- mm = &php_magic_database;
+ mm = (void *)&php_magic_database;
ret = 3;
goto internal_loaded;
}
@@ -1835,27 +1864,35 @@
if (dbname == NULL)
goto error2;

- if ((fd = open(dbname, O_RDONLY|O_BINARY)) == -1)
+#if (PHP_MAJOR_VERSION < 6)
+ stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+#else
+ stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS, NULL);
+#endif
+
+ if (!stream) {
goto error2;
+ }

- if (fstat(fd, &st) == -1) {
+ if (php_stream_stat(stream, &st) < 0) {
file_error(ms, errno, "cannot stat `%s'", dbname);
goto error1;
}
- if (st.st_size < 8) {
+
+ if (st.sb.st_size < 8) {
file_error(ms, 0, "file `%s' is too small", dbname);
goto error1;
}

- mm = emalloc((size_t)st.st_size);
- if (read(fd, mm, (size_t)st.st_size) != (size_t)st.st_size) {
+ mm = emalloc((size_t)st.sb.st_size);
+ if (php_stream_read(stream, mm, (size_t)st.sb.st_size) != (size_t)st.sb.st_size) {
file_badread(ms);
goto error1;
}
ret = 1;

- (void)close(fd);
- fd = -1;
+ php_stream_close(stream);
+ stream = NULL;

internal_loaded:
*magicp = mm;
@@ -1882,7 +1919,7 @@
if (fn == NULL) {
*nmagicp = (sizeof(php_magic_database) / sizeof(struct magic));
} else {
- *nmagicp = (uint32_t)(st.st_size / sizeof(struct magic));
+ *nmagicp = (uint32_t)(st.sb.st_size / sizeof(struct magic));
}
if (*nmagicp > 0) {
(*nmagicp)--;
@@ -1898,8 +1935,9 @@
return ret;

error1:
- if (fd != -1)
- (void)close(fd);
+ if (stream) {
+ php_stream_close(stream);
+ }
if (mm) {
efree(mm);
} else {
@@ -1921,38 +1959,47 @@
apprentice_compile(struct magic_set *ms, struct magic **magicp,
uint32_t *nmagicp, const char *fn)
{
- int fd;
char *dbname;
int rv = -1;
+ php_stream *stream;
+
+ TSRMLS_FETCH();

mkdbname(fn, &dbname, 1);

- if (dbname == NULL)
+ if (dbname == NULL) {
goto out;
+ }

- if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644)) == -1) {
+/* wb+ == O_WRONLY|O_CREAT|O_TRUNC|O_BINARY */
+#if (PHP_MAJOR_VERSION < 6)
+ stream = php_stream_open_wrapper((char *)fn, "wb+", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+#else
+ stream = php_stream_open_wrapper((char *)fn, "wb+", REPORT_ERRORS, NULL);
+#endif
+
+ if (!stream) {
file_error(ms, errno, "cannot open `%s'", dbname);
goto out;
}

- if (write(fd, ar, sizeof(ar)) != (ssize_t)sizeof(ar)) {
+ if (php_stream_write(stream, (char *)ar, sizeof(ar)) != (ssize_t)sizeof(ar)) {
file_error(ms, errno, "error writing `%s'", dbname);
goto out;
}

- if (lseek(fd, (off_t)sizeof(struct magic), SEEK_SET)
- != sizeof(struct magic)) {
+ if (php_stream_seek(stream,(off_t)sizeof(struct magic), SEEK_SET) != sizeof(struct magic)) {
file_error(ms, errno, "error seeking `%s'", dbname);
goto out;
}

- if (write(fd, *magicp, (sizeof(struct magic) * *nmagicp))
- != (ssize_t)(sizeof(struct magic) * *nmagicp)) {
+ if (php_stream_write(stream, (char *)*magicp, (sizeof(struct magic) * *nmagicp) != (ssize_t)(sizeof(struct magic) * *nmagicp))) {
file_error(ms, errno, "error writing `%s'", dbname);
goto out;
}

- (void)close(fd);
+ php_stream_close(stream);
+
rv = 0;
out:
efree(dbname);
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/compress.c?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/fileinfo/libmagic/compress.c
diff -u php-src/ext/fileinfo/libmagic/compress.c:1.4 php-src/ext/fileinfo/libmagic/compress.c:1.5
--- php-src/ext/fileinfo/libmagic/compress.c:1.4 Sun Sep 7 04:17:22 2008
+++ php-src/ext/fileinfo/libmagic/compress.c Sun Sep 7 20:29:54 2008
@@ -43,7 +43,9 @@
#include <string.h>
#include <errno.h>
#include <sys/types.h>
+#ifndef PHP_WIN32
#include <sys/ioctl.h>
+#endif
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
@@ -55,6 +57,7 @@
#include <zlib.h>
#endif

+#undef FIONREAD

#ifndef lint
FILE_RCSID("@(#)$File: compress.c,v 1.56 2008/02/07 00:58:52 christos Exp $")
@@ -86,6 +89,7 @@

private ssize_t swrite(int, const void *, size_t);
+#ifdef PHP_FILEINFO_UNCOMPRESS
private size_t uncompressbuf(struct magic_set *, int, size_t,
const unsigned char *, unsigned char **, size_t);
#ifdef BUILTIN_DECOMPRESS
@@ -138,6 +142,7 @@
ms->flags |= MAGIC_COMPRESS;
return rv;
}
+#endif

/*
* `safe' write for sockets and pipes.
@@ -297,6 +302,7 @@
return fd;
}

+#ifdef PHP_FILEINFO_UNCOMPRESS
#ifdef BUILTIN_DECOMPRESS

#define FHCRC (1 << 1)
@@ -304,6 +310,7 @@
#define FNAME (1 << 3)
#define FCOMMENT (1 << 4)

+
private size_t
uncompressgzipped(struct magic_set *ms, const unsigned char *old,
unsigned char **newch, size_t n)
@@ -485,3 +492,4 @@
return n;
}
}
+#endif /* if PHP_FILEINFO_UNCOMPRESS */
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/file.h?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/fileinfo/libmagic/file.h
diff -u php-src/ext/fileinfo/libmagic/file.h:1.4 php-src/ext/fileinfo/libmagic/file.h:1.5
--- php-src/ext/fileinfo/libmagic/file.h:1.4 Fri Aug 29 12:05:35 2008
+++ php-src/ext/fileinfo/libmagic/file.h Sun Sep 7 20:29:54 2008
@@ -33,9 +33,7 @@
#ifndef __file_h__
#define __file_h__

-//#ifdef HAVE_CONFIG_H
#include "config.h"
-//#endif */

#include <stdio.h> /* Include that here, to make sure __P gets defined */
#include <errno.h>
@@ -46,6 +44,9 @@
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
+#ifdef PHP_WIN32
+#include "win32/php_stdint.h"
+#endif

#include "php.h"
#include "ext/standard/php_string.h"
@@ -62,7 +63,7 @@
#define MAGIC "/etc/magic"
#endif

-#ifdef __EMX__
+#if defined(__EMX__) || defined(PHP_WIN32)
#define PATHSEP ';'
#else
#define PATHSEP ':'
@@ -323,16 +324,18 @@

struct stat;
protected const char *file_fmttime(uint32_t, int);
-protected int file_buffer(struct magic_set *, int, const char *, const void *,
+protected int file_buffer(struct magic_set *, php_stream *, const char *, const void *,
size_t);
-protected int file_fsmagic(struct magic_set *, const char *, struct stat *);
+protected int file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb, php_stream *stream);
protected int file_pipe2file(struct magic_set *, int, const void *, size_t);
protected int file_printf(struct magic_set *, const char *, ...);
protected int file_reset(struct magic_set *);
protected int file_tryelf(struct magic_set *, int, const unsigned char *,
size_t);
+#ifdef PHP_FILEINFO_UNCOMPRESS
protected int file_zmagic(struct magic_set *, int, const char *,
const unsigned char *, size_t);
+#endif
protected int file_ascmagic(struct magic_set *, const unsigned char *, size_t);
protected int file_is_tar(struct magic_set *, const unsigned char *, size_t);
protected int file_softmagic(struct magic_set *, const unsigned char *, size_t, int);
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/fsmagic.c?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/fileinfo/libmagic/fsmagic.c
diff -u php-src/ext/fileinfo/libmagic/fsmagic.c:1.1 php-src/ext/fileinfo/libmagic/fsmagic.c:1.2
--- php-src/ext/fileinfo/libmagic/fsmagic.c:1.1 Fri Jul 11 14:13:50 2008
+++ php-src/ext/fileinfo/libmagic/fsmagic.c Sun Sep 7 20:29:54 2008
@@ -60,69 +60,64 @@
FILE_RCSID("@(#)$File: fsmagic.c,v 1.50 2008/02/12 17:22:54 rrt Exp $")
#endif /* lint */

-private int
-bad_link(struct magic_set *ms, int err, char *buf)
-{
- char *errfmt;
- if (err == ELOOP)
- errfmt = "symbolic link in a loop";
- else
- errfmt = "broken symbolic link to `%s'";
- if (ms->flags & MAGIC_ERROR) {
- file_error(ms, err, errfmt, buf);
- return -1;
- }
- if (file_printf(ms, errfmt, buf) == -1)
- return -1;
- return 1;
-}
+#ifdef PHP_WIN32
+
+# undef S_IFIFO
+#endif
+
+
+#ifndef S_ISDIR
+#define S_ISDIR(mode) ((mode) & _S_IFDIR)
+#endif
+
+#ifndef S_ISREG
+#define S_ISREG(mode) ((mode) & _S_IFREG)
+#endif

protected int
-file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
+file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb, php_stream *stream)
{
- int ret = 0;
int mime = ms->flags & MAGIC_MIME;
-#ifdef S_IFLNK
- char buf[BUFSIZ+4];
- int nch;
- struct stat tstatbuf;
-#endif
-
- if (fn == NULL)
- return 0;
+ TSRMLS_FETCH();

- /*
- * Fstat is cheaper but fails for files you don't have read perms on.
- * On 4.2BSD and similar systems, use lstat() to identify symlinks.
- */
-#ifdef S_IFLNK
- if ((ms->flags & MAGIC_SYMLINK) == 0)
- ret = lstat(fn, sb);
- else
-#endif
- ret = stat(fn, sb); /* don't merge into if; see "ret =" above */
-
- if (ret) {
- if (ms->flags & MAGIC_ERROR) {
- file_error(ms, errno, "cannot stat `%s'", fn);
- return -1;
- }
- if (file_printf(ms, "cannot open `%s' (%s)",
- fn, strerror(errno)) == -1)
- return -1;
- return 1;
+ if (!fn && !stream) {
+ return -1;
}

- if (mime) {
- if ((sb->st_mode & S_IFMT) != S_IFREG) {
- if ((mime & MAGIC_MIME_TYPE) &&
- file_printf(ms, "application/x-not-regular-file")
- == -1)
- return -1;
+ if (stream) {
+ php_stream_statbuf ssb;
+ if (php_stream_stat(stream, &ssb) < 0) {
+ if (ms->flags & MAGIC_ERROR) {
+ file_error(ms, errno, "cannot stat `%s'", fn);
+ }
+ return 1;
+ }
+ memcpy(sb, &ssb.sb, sizeof(struct stat));
+ } else {
+ if (php_sys_stat(fn, sb) != 0) {
+ if (ms->flags & MAGIC_ERROR) {
+ file_error(ms, errno, "cannot stat `%s'", fn);
+ }
return 1;
}
}
- else {
+
+ if (mime) {
+ if (!S_ISREG(sb->st_mode)) {
+ if ((mime & MAGIC_MIME_TYPE) &&
+ file_printf(ms, "application/x-not-regular-file") == -1) {
+ return -1;
+ }
+ return 1;
+ }
+
+ if (S_ISDIR(sb->st_mode)) {
+ if (file_printf(ms, "directory") == -1) {
+ return -1;
+ }
+ return 1;
+ }
+ } else {
#ifdef S_ISUID
if (sb->st_mode & S_ISUID)
if (file_printf(ms, "setuid ") == -1)
@@ -139,65 +134,41 @@
return -1;
#endif
}
-
+
switch (sb->st_mode & S_IFMT) {
- case S_IFDIR:
- if (file_printf(ms, "directory") == -1)
- return -1;
- return 1;
-#ifdef S_IFCHR
- case S_IFCHR:
- /*
- * If -s has been specified, treat character special files
- * like ordinary files. Otherwise, just report that they
- * are block special files and go on to the next file.
- */
- if ((ms->flags & MAGIC_DEVICES) != 0)
- break;
-#ifdef HAVE_STAT_ST_RDEV
-# ifdef dv_unit
- if (file_printf(ms, "character special (%d/%d/%d)",
- major(sb->st_rdev), dv_unit(sb->st_rdev),
- dv_subunit(sb->st_rdev)) == -1)
- return -1;
-# else
- if (file_printf(ms, "character special (%ld/%ld)",
- (long) major(sb->st_rdev), (long) minor(sb->st_rdev)) == -1)
- return -1;
-# endif
-#else
- if (file_printf(ms, "character special") == -1)
- return -1;
-#endif
- return 1;
-#endif
-#ifdef S_IFBLK
- case S_IFBLK:
- /*
- * If -s has been specified, treat block special files
- * like ordinary files. Otherwise, just report that they
- * are block special files and go on to the next file.
- */
- if ((ms->flags & MAGIC_DEVICES) != 0)
- break;
-#ifdef HAVE_STAT_ST_RDEV
-# ifdef dv_unit
- if (file_printf(ms, "block special (%d/%d/%d)",
- major(sb->st_rdev), dv_unit(sb->st_rdev),
- dv_subunit(sb->st_rdev)) == -1)
- return -1;
-# else
- if (file_printf(ms, "block special (%ld/%ld)",
- (long)major(sb->st_rdev), (long)minor(sb->st_rdev)) == -1)
- return -1;
+#ifndef PHP_WIN32
+# ifdef S_IFCHR
+ case S_IFCHR:
+ /*
+ * If -s has been specified, treat character special files
+ * like ordinary files. Otherwise, just report that they
+ * are block special files and go on to the next file.
+ */
+ if ((ms->flags & MAGIC_DEVICES) != 0) {
+ break;
+ }
+# ifdef HAVE_STAT_ST_RDEV
+# ifdef dv_unit
+ if (file_printf(ms, "character special (%d/%d/%d)",
+ major(sb->st_rdev), dv_unit(sb->st_rdev),
+ dv_subunit(sb->st_rdev)) == -1) {
+ return -1;
+ }
+# else
+ if (file_printf(ms, "character special (%ld/%ld)",
+ (long) major(sb->st_rdev), (long) minor(sb->st_rdev)) == -1) {
+ return -1;
+ }
+# endif
+# else
+ if (file_printf(ms, "character special") == -1) {
+ return -1;
+ }
+# endif
+ return 1;
# endif
-#else
- if (file_printf(ms, "block special") == -1)
- return -1;
#endif
- return 1;
-#endif
- /* TODO add code to handle V7 MUX and Blit MUX files */
+
#ifdef S_IFIFO
case S_IFIFO:
if((ms->flags & MAGIC_DEVICES) != 0)
@@ -212,67 +183,17 @@
return -1;
return 1;
#endif
+
#ifdef S_IFLNK
case S_IFLNK:
- if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) {
+ /* stat is used, if it made here then the link is broken */
if (ms->flags & MAGIC_ERROR) {
- file_error(ms, errno, "unreadable symlink `%s'",
- fn);
+ file_error(ms, errno, "unreadable symlink `%s'", fn);
return -1;
}
- if (file_printf(ms,
- "unreadable symlink `%s' (%s)", fn,
- strerror(errno)) == -1)
- return -1;
- return 1;
- }
- buf[nch] = '\0'; /* readlink(2) does not do this */
-
- /* If broken symlink, say so and quit early. */
- if (*buf == '/') {
- if (stat(buf, &tstatbuf) < 0)
- return bad_link(ms, errno, buf);
- } else {
- char *tmp;
- char buf2[BUFSIZ+BUFSIZ+4];
-
- if ((tmp = strrchr(fn, '/')) == NULL) {
- tmp = buf; /* in current directory anyway */
- } else {
- if (tmp - fn + 1 > BUFSIZ) {
- if (ms->flags & MAGIC_ERROR) {
- file_error(ms, 0,
- "path too long: `%s'", buf);
- return -1;
- }
- if (file_printf(ms,
- "path too long: `%s'", fn) == -1)
- return -1;
- return 1;
- }
- (void)strcpy(buf2, fn); /* take dir part */
- buf2[tmp - fn + 1] = '\0';
- (void)strcat(buf2, buf); /* plus (rel) link */
- tmp = buf2;
- }
- if (stat(tmp, &tstatbuf) < 0)
- return bad_link(ms, errno, buf);
- }
-
- /* Otherwise, handle it. */
- if ((ms->flags & MAGIC_SYMLINK) != 0) {
- const char *p;
- ms->flags &= MAGIC_SYMLINK;
- p = magic_file(ms, buf);
- ms->flags |= MAGIC_SYMLINK;
- return p != NULL ? 1 : -1;
- } else { /* just print what it points to */
- if (file_printf(ms, "symbolic link to `%s'",
- buf) == -1)
- return -1;
- }
return 1;
#endif
+
#ifdef S_IFSOCK
#ifndef __COHERENT__
case S_IFSOCK:
@@ -281,12 +202,14 @@
return 1;
#endif
#endif
- case S_IFREG:
- break;
- default:
- file_error(ms, 0, "invalid mode 0%o", sb->st_mode);
- return -1;
- /*NOTREACHED*/
+
+ case S_IFREG:
+ break;
+
+ default:
+ file_error(ms, 0, "invalid mode 0%o", sb->st_mode);
+ return -1;
+ /*NOTREACHED*/
}

/*
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/funcs.c?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/fileinfo/libmagic/funcs.c
diff -u php-src/ext/fileinfo/libmagic/funcs.c:1.7 php-src/ext/fileinfo/libmagic/funcs.c:1.8
--- php-src/ext/fileinfo/libmagic/funcs.c:1.7 Fri Aug 29 12:05:35 2008
+++ php-src/ext/fileinfo/libmagic/funcs.c Sun Sep 7 20:29:54 2008
@@ -146,7 +146,7 @@
}

protected int
-file_buffer(struct magic_set *ms, int fd, const char *inname, const void *buf,
+file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const void *buf,
size_t nb)
{
int m;
@@ -166,7 +166,7 @@
return 1;
}

-#ifdef __EMX__
+#if defined(__EMX__)
if ((ms->flags & MAGIC_NO_CHECK_APPTYPE) == 0 && inname) {
switch (file_os2_apptype(ms, inname, buf, nb)) {
case -1:
@@ -179,31 +179,29 @@
}
#endif

+#if PHP_FILEINFO_UNCOMPRESS
/* try compression stuff */
if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) != 0 ||
- (m = file_zmagic(ms, fd, inname, buf, nb)) == 0) {
- /* Check if we have a tar file */
- if ((ms->flags & MAGIC_NO_CHECK_TAR) != 0 ||
- (m = file_is_tar(ms, buf, nb)) == 0) {
- /* try tests in /etc/magic (or surrogate magic file) */
- if ((ms->flags & MAGIC_NO_CHECK_SOFT) != 0 ||
- (m = file_softmagic(ms, buf, nb, BINTEST)) == 0) {
- /* try known keywords, check whether it is ASCII */
- if ((ms->flags & MAGIC_NO_CHECK_ASCII) != 0 ||
- (m = file_ascmagic(ms, buf, nb)) == 0) {
- /* abandon hope, all ye who remain here */
- if ((!mime || (mime & MAGIC_MIME_TYPE)) &&
- file_printf(ms, mime ? "application/octet-stream" :
- "data") == -1)
- return -1;
- m = 1;
- }
- }
+ (m = file_zmagic(ms, stream, inname, buf, nb)) == 0)
+#endif
+ {
+ /* Check if we have a tar file */
+ if ((ms->flags & MAGIC_NO_CHECK_TAR) != 0 || (m = file_is_tar(ms, buf, nb)) == 0) {
+ /* try tests in /etc/magic (or surrogate magic file) */
+ if ((ms->flags & MAGIC_NO_CHECK_SOFT) != 0 || (m = file_softmagic(ms, buf, nb, BINTEST)) == 0) {
+ /* try known keywords, check whether it is ASCII */
+ if ((ms->flags & MAGIC_NO_CHECK_ASCII) != 0 || (m = file_ascmagic(ms, buf, nb)) == 0) {
+ /* abandon hope, all ye who remain here */
+ if ((!mime || (mime & MAGIC_MIME_TYPE)) && file_printf(ms, mime ? "application/octet-stream" : "data") == -1) {
+ return -1;
+ }
+ m = 1;
+ }
+ }
}
}
#ifdef BUILTIN_ELF
- if ((ms->flags & MAGIC_NO_CHECK_ELF) == 0 && m == 1 &&
- nb > 5 && fd != -1) {
+ if ((ms->flags & MAGIC_NO_CHECK_ELF) == 0 && m == 1 && nb > 5 && fd != -1) {
/*
* We matched something in the file, so this *might*
* be an ELF file, and the file is at least 5 bytes
@@ -212,7 +210,7 @@
* information from the ELF headers that cannot easily
* be extracted with rules in the magic file.
*/
- (void)file_tryelf(ms, fd, buf, nb);
+ (void)file_tryelf(ms, stream, buf, nb);
}
#endif
return m;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/magic.c?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/fileinfo/libmagic/magic.c
diff -u php-src/ext/fileinfo/libmagic/magic.c:1.3 php-src/ext/fileinfo/libmagic/magic.c:1.4
--- php-src/ext/fileinfo/libmagic/magic.c:1.3 Fri Aug 29 12:05:35 2008
+++ php-src/ext/fileinfo/libmagic/magic.c Sun Sep 7 20:29:54 2008
@@ -30,10 +30,19 @@

#include <stdio.h>
#include <stdlib.h>
+#ifdef PHP_WIN32
+#include "win32/unistd.h"
+#else
#include <unistd.h>
+#endif
#include <string.h>
#include <sys/types.h>
-#include <sys/param.h> /* for MAXPATHLEN */
+#ifdef PHP_WIN32
+# include "config.w32.h"
+#else
+# include "php_config.h"
+#endif
+
#include <sys/stat.h>
#include <limits.h> /* for PIPE_BUF */

@@ -55,7 +64,9 @@
#include <locale.h>
#endif

-#include <netinet/in.h> /* for byte swapping */
+#ifndef PHP_WIN32
+# include <netinet/in.h> /* for byte swapping */
+#endif

#include "patchlevel.h"

@@ -72,6 +83,11 @@
#endif
#endif

+#ifdef PHP_WIN32
+# undef S_IFLNK
+# undef S_IFIFO
+#endif
+
#ifdef __EMX__
private char *apptypeName = NULL;
protected int file_os2_apptype(struct magic_set *ms, const char *fn,
@@ -82,7 +98,7 @@
private void close_and_restore(const struct magic_set *, const char *, int,
const struct stat *);
private int info_from_stat(struct magic_set *, mode_t);
-private const char *file_or_fd(struct magic_set *, const char *, int);
+private const char *file_or_stream(struct magic_set *, const char *, php_stream *);

#ifndef STDIN_FILENO
#define STDIN_FILENO 0
@@ -204,9 +220,6 @@
close_and_restore(const struct magic_set *ms, const char *name, int fd,
const struct stat *sb)
{
- if (fd == STDIN_FILENO)
- return;
- (void) close(fd);

if ((ms->flags & MAGIC_PRESERVE_ATIME) != 0) {
/*
@@ -240,7 +253,7 @@
public const char *
magic_descriptor(struct magic_set *ms, int fd)
{
- return file_or_fd(ms, NULL, fd);
+ return file_or_stream(ms, NULL, NULL);
}

/*
@@ -249,17 +262,28 @@
public const char *
magic_file(struct magic_set *ms, const char *inname)
{
- return file_or_fd(ms, inname, STDIN_FILENO);
+ return file_or_stream(ms, inname, NULL);
+}
+
+public const char *
+magic_stream(struct magic_set *ms, php_stream *stream)
+{
+ return file_or_stream(ms, NULL, stream);
}

private const char *
-file_or_fd(struct magic_set *ms, const char *inname, int fd)
+file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream)
{
int rv = -1;
unsigned char *buf;
struct stat sb;
ssize_t nbytes = 0; /* number of bytes read from a datafile */
- int ispipe = 0;
+ int no_in_stream = 0;
+ TSRMLS_FETCH();
+
+ if (!inname && !stream) {
+ return NULL;
+ }

/*
* one extra for terminating '\0', and
@@ -268,93 +292,66 @@
#define SLOP (1 + sizeof(union VALUETYPE))
buf = emalloc(HOWMANY + SLOP);

- if (file_reset(ms) == -1)
+ if (file_reset(ms) == -1) {
goto done;
+ }

- switch (file_fsmagic(ms, inname, &sb)) {
- case -1: /* error */
- goto done;
- case 0: /* nothing found */
- break;
- default: /* matched it and printed type */
+ switch (file_fsmagic(ms, inname, &sb, stream)) {
+ case -1: /* error */
+ goto done;
+ case 0: /* nothing found */
+ break;
+ default: /* matched it and printed type */
+ rv = 0;
+ goto done;
+ }
+
+ errno = 0;
+
+ if (!stream && inname) {
+ no_in_stream = 1;
+#if (PHP_MAJOR_VERSION < 6)
+ stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+#else
+ stream = php_stream_open_wrapper(inname, "rb", REPORT_ERRORS, NULL);
+#endif
+ }
+
+ if (!stream) {
+ fprintf(stderr, "couldn't open file\n");
+ if (info_from_stat(ms, sb.st_mode) == -1)
+ goto done;
rv = 0;
goto done;
}

- if (inname == NULL) {
- if (fstat(fd, &sb) == 0 && S_ISFIFO(sb.st_mode))
- ispipe = 1;
- } else {
- int flags = O_RDONLY|O_BINARY;
-
- if (stat(inname, &sb) == 0 && S_ISFIFO(sb.st_mode)) {
- flags |= O_NONBLOCK;
- ispipe = 1;
- }
-
- errno = 0;
- if ((fd = open(inname, flags)) < 0) {
-#ifdef __CYGWIN__
- /* FIXME: Do this with EXEEXT from autotools */
- char *tmp = alloca(strlen(inname) + 5);
- (void)strcat(strcpy(tmp, inname), ".exe");
- if ((fd = open(tmp, flags)) < 0) {
-#endif
- fprintf(stderr, "couldn't open file\n");
- if (info_from_stat(ms, sb.st_mode) == -1)
- goto done;
- rv = 0;
- goto done;
-#ifdef __CYGWIN__
- }
-#endif
- }
#ifdef O_NONBLOCK
- if ((flags = fcntl(fd, F_GETFL)) != -1) {
- flags &= ~O_NONBLOCK;
- (void)fcntl(fd, F_SETFL, flags);
- }
+/* we should be already be in non blocking mode for network socket */
#endif
- }

/*
* try looking at the first HOWMANY bytes
*/
- if (ispipe) {
- ssize_t r = 0;
-
- while ((r = sread(fd, (void *)&buf[nbytes],
- (size_t)(HOWMANY - nbytes), 1)) > 0) {
- nbytes += r;
- if (r < PIPE_BUF) break;
- }
-
- if (nbytes == 0) {
- /* We can not read it, but we were able to stat it. */
- if (info_from_stat(ms, sb.st_mode) == -1)
- goto done;
- rv = 0;
- goto done;
- }
-
- } else {
- if ((nbytes = read(fd, (char *)buf, HOWMANY)) == -1) {
- file_error(ms, errno, "cannot read `%s'", inname);
- goto done;
- }
+ if ((nbytes = php_stream_read(stream, (char *)buf, HOWMANY)) < 0) {
+ file_error(ms, errno, "cannot read `%s'", inname);
+ goto done;
}

(void)memset(buf + nbytes, 0, SLOP); /* NUL terminate */
- if (file_buffer(ms, fd, inname, buf, (size_t)nbytes) == -1)
+ if (file_buffer(ms, stream, inname, buf, (size_t)nbytes) == -1)
goto done;
rv = 0;
done:
efree(buf);
- close_and_restore(ms, inname, fd, &sb);
+
+ if (no_in_stream && stream) {
+ php_stream_close(stream);
+ }
+
+ close_and_restore(ms, inname, 0, &sb);
return rv == 0 ? file_getbuffer(ms) : NULL;
}

-
public const char *
magic_buffer(struct magic_set *ms, const void *buf, size_t nb)
{
@@ -364,7 +361,7 @@
* The main work is done here!
* We have the file name and/or the data buffer to be identified.
*/
- if (file_buffer(ms, -1, NULL, buf, nb) == -1) {
+ if (file_buffer(ms, NULL, NULL, buf, nb) == -1) {
return NULL;
}
return file_getbuffer(ms);
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/magic.h?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/fileinfo/libmagic/magic.h
diff -u php-src/ext/fileinfo/libmagic/magic.h:1.1 php-src/ext/fileinfo/libmagic/magic.h:1.2
--- php-src/ext/fileinfo/libmagic/magic.h:1.1 Fri Jul 11 14:13:50 2008
+++ php-src/ext/fileinfo/libmagic/magic.h Sun Sep 7 20:29:54 2008
@@ -64,6 +64,7 @@
void magic_close(magic_t);

const char *magic_file(magic_t, const char *);
+const char *magic_stream(magic_t, php_stream *);
const char *magic_descriptor(magic_t, int);
const char *magic_buffer(magic_t, const void *, size_t);

http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_file_001.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_file_001.phpt
diff -u php-src/ext/fileinfo/tests/finfo_file_001.phpt:1.2 php-src/ext/fileinfo/tests/finfo_file_001.phpt:1.3
--- php-src/ext/fileinfo/tests/finfo_file_001.phpt:1.2 Tue Aug 26 16:19:29 2008
+++ php-src/ext/fileinfo/tests/finfo_file_001.phpt Sun Sep 7 20:29:54 2008
@@ -11,9 +11,16 @@
var_dump(finfo_file($fp, '&'));

?>
---EXPECT--
+--EXPECTF--
+Warning: finfo_file(): Empty filename or path in %s on line %d
bool(false)
+
+Warning: finfo_file(): Empty filename or path in %s on line %d
bool(false)
+
+Warning: finfo_file(): Empty filename or path in %s on line %d
bool(false)
string(9) "directory"
+
+Warning: finfo_file(): File or path not found '&' in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/mime_content_type_001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/fileinfo/tests/mime_content_type_001.phpt
diff -u php-src/ext/fileinfo/tests/mime_content_type_001.phpt:1.1 php-src/ext/fileinfo/tests/mime_content_type_001.phpt:1.2
--- php-src/ext/fileinfo/tests/mime_content_type_001.phpt:1.1 Mon Sep 1 23:41:34 2008
+++ php-src/ext/fileinfo/tests/mime_content_type_001.phpt Sun Sep 7 20:29:54 2008
@@ -21,7 +21,7 @@

Warning: mime_content_type(): Can only process string or stream arguments in %s on line %d

-Warning: mime_content_type(foo/inexistent): failed to open stream: No such file or directory in %s on line %d
+Warning: mime_content_type(): File or path not found 'foo/inexistent' in %s on line %d

Warning: mime_content_type(): Empty filename or path in %s on line %d

felipe Sun Sep 7 20:29:54 2008 UTC

Modified files:
/php-src/ext/fileinfo fileinfo.c
/php-src/ext/fileinfo/libmagic apprentice.c compress.c file.h
fsmagic.c funcs.c magic.c magic.h
/php-src/ext/fileinfo/tests finfo_file_001.phpt
mime_content_type_001.phpt
Log:
- MFB:
- use php's stream in libmagic
- remove duplicate code (like mime_content_type() compatibility function
now use the same base as finfo_file())
- make it portable (works now on windows too, belongs other OSes)

- don't close caller streams in libmagic (prevent leak and zombie stream)
- string returned by magic_* are freed on magic_close, duplicate before
calling magic_close (set return value)
- if stat failed, don't try to call magic_* (when FILEINFO_MODE_FILE)

[PHP-DEV] make fails due to ext/iconv/php_have_ibm_iconv.h missing (5.3 including alpha2)

2008-09-07T13:11:00.000-07:00

In an attempt to do some testing of 5.3 I have being trying to compile it on my Mac (MacOSX10.5)
with the same configure line[1] as I use for my 'current' version (5.2.6), this is turning
out to be impossible because (so far) of a missing file ext/iconv/php_have_ibm_iconv.h

the configure line I want to use is as follows (note that it specifies '--without-iconv'):

'./configure' '--with-config-file-path=/etc' '--sysconfdir=/private/etc' '--prefix=/usr/local/php5.3alpha2'
'--mandir=/usr/share/man' '--infodir=/usr/share/info' '--with-xsl=/usr' '--with-tidy=/opt/local' '--enable-mbstring' '--with-gd'
'--enable-gd-native-ttf' '--with-jpeg-dir=/opt/local' '--with-png-dir=/opt/local' '--with-zlib-dir' '--enable-sockets'
'--enable-exif' '--with-mcrypt=/opt/local' '--with-mysql=/usr/local/mysql' '--with-mysql-sock=/private/tmp/mysql.sock'
'--with-mysqli=/usr/local/mysql/bin/mysql_config' '--with-pdo-mysql=/usr/local/mysql/bin/mysql_config'
'--with-freetype-dir=/opt/local' '--with-xpm-dir=/Developer/SDKs/MacOSX10.5.sdk/usr/X11' '--with-ldap' '--with-xmlrpc'
'--enable-soap' '--enable-sqlite-utf8' '--enable-ftp' '--enable-sockets' '--with-bz2' '--enable-zip' '--enable-pcntl'
'--enable-shmop' '--enable-sysvsem' '--enable-sysvshm' '--enable-sysvmsg' '--enable-bcmath' '--with-gettext=/opt/local'
'--with-curl' '--with-mcrypt=/opt/local' '--with-interbase=/opt' '--without-iconv' '--enable-cli' '--with-sqlite'

the error message from make is:

In file included from /Users/jochem/src/php-5.3.0alpha2/ext/standard/info.c:47:
/Users/jochem/src/php-5.3.0alpha2/ext/iconv/php_iconv.h:42:42: error: ext/iconv/php_have_ibm_iconv.h: No such file or directory

I have (just now) been able to build a very minimal install of 5.3 using the following configure line, which does give
me enough to be able to test some stuff related to namespaces/LSB/etc:

'./configure' '--with-config-file-path=/usr/local/php5.3alpha2' '--sysconfdir=/private/etc' '--prefix=/usr/local/php5.3alpha2'
'--mandir=/usr/share/man' '--infodir=/usr/share/info' '--disable-all' '--enable-cli'

it does seem that the file ext/iconv/php_have_ibm_iconv.h really is missing and that it should be there
(although I have no idea why iconv is referenced given the '--without-iconv' ... there is probably good reason,
but it's over my head, so to speak.

rgds,
Jochem

[1]minus the apache module for now ... as I'm afraid 'make install' will
break my current install, which I really can't afford to break ... I'm no wizard but I do need to be
able to do my job :-/ ... if anyone knows of some details info on how to keep multiple installs of
php around (including apache modules) and being able to switch between them with minimal fuss then
I be very happy to learn!

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] namespace RFC

2008-09-07T12:51:00.001-07:00

Lukas Kahwe Smith schreef:
>
> On 31.08.2008, at 15:37, Lukas Kahwe Smith wrote:
>
>> Hello all,
>>
>> All the recent discussions about namespaces, have left many of us
>> wondering if our implementation is rock solid or not. However the
>> discussions were not really well organized. This is why I am thankful
>> that Marcus and Felipe have spend the better part of this Sunday to
>> write an RFC [1] that hopefully summarizes all the key concerns. Also
>> they have created a patch that they feel addresses the concerns.
>
>> [1] http://wiki.php.net/rfc/namespacecurlies
>
> I have also asked in my blog about practical experiences from people
> using PHP 5.3.0 with namespaces in development:
> http://pooteeweet.org/blog/1288
>
> The gist in the first 2 responses seem to be that they are ok with the
> current state of things.

they both admit they don't do (or are not interested in) the major point
the RFC tries to tackle (i.e. file concatenation).

subsequent posts do point out problems:

1. "non-deterministic" (a.k.a error prone) __autoloading issues

- IFAIC Greg's arguments are sound, Stanislav's performance arguments are bogus
(imho) simply because, up until the point that the new functionality is
stable, complete and devoid of the WTF-factor it's performance should be
ignored ... make it work, then make it fast?

2. namespaced constants/functions not autoloadable
3. namespaced functions not aliasable
4. the abiguity with static methods and namespaced functions

- Elizabeth states this very succinctly.

5. inordinate number of use statements
6. internal classes being 'favored' over user classes.

- which is likely to mean people will either avoid namespaces, avoid use statements
or worse still miss a use statement now and again ... see point 1.

If you ask me a major issue stems from the fact that the namespace scope operator
was chosen to be the same as the class scope operator, even if this incurred no technical
problems (which, I think, point 4 is), it still incurs the potential for major WTF when
simply reading code - at the very least having to constantly check the 'use' statements
at the top of a file to determine the actually referred to 'element'.

Lukas, you stated a while back you were nervous about the namespace functionality,
I believe you are right to be so. what there is currently will most likely do the
opposite of what it is intended to ... the intention being, I assume, to increase php's
'enterprise level' functionality & appearance (in terms of suitability).

rgds,
Jochem

PS - please be a Dictator! currently it seems that the dev that shouts the loudest gets
to shove his opinion/implementation down everyone's neck regardless of anyone's
objections (however sound) ... even when those objections come from other devs,
which makes a farce of the concept of meritocracy, besides nothing about open source
suggested it's development process needs to be done by commitee.

the more I think about it the more I believe php would benefit from a benevolent
dictator ... who that might be is a more difficult question to answer, one steeped
in politics. I could offer about 3 names that I think would suit the position,
but I doubt anyone of 'importance' has read this far and if they had they probably
attribute about as much weight to my opinions as they do to the average life of an ameoba.

> Anyways, anyone who cares should make their opinion known on this list
> as clear as possible by Monday (if someone is aware of a good discussion
> outside of internals please also let us know), so that Johannes and I
> can make a decision no later than Tuesday without having to feel like
> dictators. Personally at this point I would leave things as is for now,
> move to beta and hope that this also increases the number of end users
> testing and giving feedback. While I hope that we dont have to do big
> changes after going to beta, if feedback makes it necessary, we
> obviously have to accept it.
>
> regards,
> Lukas Kahwe Smith
> mls@pooteeweet.org
>
>
>
>

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

[DOC-CVS] cvs: phpdoc /en/language control-structures.xml

2008-09-07T12:27:00.001-07:00

kalle Sun Sep 7 19:27:41 2008 UTC

Modified files:
/phpdoc/en/language control-structures.xml
Log:
Fix php highlight in examples

http://cvs.php.net/viewvc.cgi/phpdoc/en/language/control-structures.xml?r1=1.167&r2=1.168&diff_format=u
Index: phpdoc/en/language/control-structures.xml
diff -u phpdoc/en/language/control-structures.xml:1.167 phpdoc/en/language/control-structures.xml:1.168
--- phpdoc/en/language/control-structures.xml:1.167 Sun Aug 31 01:04:21 2008
+++ phpdoc/en/language/control-structures.xml Sun Sep 7 19:27:41 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-
+
<chapter xml:id="language.control-structures" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Control Structures</title>

@@ -532,7 +532,7 @@
</simpara>
<para>
<informalexample>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
<?php
/*
@@ -562,7 +562,7 @@
</simpara>
<para>
<informalexample>
- <programlisting>
+ <programlisting role="php">
<![CDATA[
<?php
$people = Array(

--
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] php image and javascript include

2008-09-07T11:45:00.000-07:00

javasac wrote:

<snip>

Where is the PHP? There's nothing between <?php and ?> tags. Nothing
between PHP short tags ( <? and ?> ), either.

Reese

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] php image and javascript include

2008-09-07T11:43:00.000-07:00

javasac wrote:
> [lots of stuff ...]

I'm guessing that was the *output* of the PHP file, not the script itself.

You've got a couple different errors here. The first is that you're not
creating img tags. All you have here is the path to the image. A browser
isn't going to do anything with that.

> <td width="10" height="7">
> images/box_bottom_lft.jpg </td>

Second, at least one of the image paths is relative to your own desktop
computer's drive (why is it that this always happens on a Windows box?)

> <td width="11">
> C:/wamp/www/yojoe-web/html/site/images/box_top_rht.jpg </td>

Also, in the future, it'd be better to trim out the completely
unnecessary bits. That's an awful lot of (bloated) HTML and javascript
to wade through.

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DB] If( Query)

2008-09-07T11:39:00.000-07:00

Is your table set up in the same way on your webserver? Maybe you
forgot to set the default value to na.gif in your item_pix column. If
not, can you send your table definition?

On Sat, Sep 6, 2008 at 9:02 PM, Chris Hale <php@chrishale.co.uk> wrote:
> I have the following function:
>
> function
> add_item($item_name,$item_desc,$item_price,$item_man_id,$item_cat_id,$item_pix)
> {
> connect();
> if($item_pix == "")
> {
> $sql = "INSERT INTO items
> (item_name,item_desc,item_price,item_man_id,item_cat_id) VALUES
> ('$item_name','$item_desc','$item_price','$item_man_id','$item_cat_id')";
> }
> else {
> $sql = "INSERT INTO items
> (item_name,item_desc,item_price,item_pix,item_man_id,item_cat_id) VALUES
> ('$item_name','$item_desc','$item_price','$item_pix','$item_man_id','$item_cat_id')";
> }
> mysql_query($sql);
> return;
> }
>
> I am using the if statement because i want it so that if no picture is
> uploaded the entry is blank and the mysql database has a default entry of
> na.gif which is a "picture coming soon picture".
>
> It works fine when i run in localy on MAMP, but if i run it on my web server
> it doesnt add the row.
>
> Is this a compatability error? or is there a better way to write this?
>
> Thanks
>
> --
> PHP Database Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>

--
PHP Database Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

2008-09-07T11:32:00.000-07:00

hi Ilia,

On Sun, Sep 7, 2008 at 7:57 PM, Ilia Alshanetsky <ilia@prohost.org> wrote:
> It compiled fine on 5.3, and there is no references to that define. I think
> something was not merged into HEAD.

It was not merged in HEAD because HEAD did not work at all. I can do
the merge next week.

Cheers,
--
Pierre

http://blog.thepimp.net | http://www.libgd.org

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] php image and javascript include

2008-09-07T11:12:00.000-07:00

You generally need some PHP to have PHP errors, but you don't have any here. What was the code that actually gave you the errors?

Ash
www.ashleysheridan.co.uk

Re: [PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

2008-09-07T11:04:00.000-07:00

Instead of everyone saying "maybe something wasn't merged.." why don't you merge
the stuff to HEAD and stop the whining?

--Jani

Ilia Alshanetsky kirjoitti:
> It compiled fine on 5.3, and there is no references to that define. I
> think something was not merged into HEAD.
>
>
> On 6-Sep-08, at 7:12 PM, Felix De Vliegher wrote:
>
>> Hi Ilia
>>
>> I might be wrong but with removing those, building actually fails with
>> me.
>>
>> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c: In
>> function 'file_zmagic':
>> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:106:
>> error: 'ncompr' undeclared (first use in this function)
>> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:106:
>> error: (Each undeclared identifier is reported only once
>> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:106:
>> error: for each function it appears in.)
>> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c: In
>> function 'sread':
>> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:183:
>> error: 'cnt' undeclared (first use in this function)
>>
>> Regards,
>> Felix
>>
>> Op 6-sep-08, om 23:32 heeft Ilia Alshanetsky het volgende geschreven:
>>
>>> iliaa Sat Sep 6 21:32:32 2008 UTC
>>>
>>> Modified files:
>>> /php-src/ext/fileinfo/libmagic compress.c
>>> Log:
>>> MFB: removed unused variables
>>>
>>>
>>> http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/compress.c?r1=1.2&r2=1.3&diff_format=u
>>>
>>> Index: php-src/ext/fileinfo/libmagic/compress.c
>>> diff -u php-src/ext/fileinfo/libmagic/compress.c:1.2
>>> php-src/ext/fileinfo/libmagic/compress.c:1.3
>>> --- php-src/ext/fileinfo/libmagic/compress.c:1.2 Tue Aug 26
>>> 12:24:12 2008
>>> +++ php-src/ext/fileinfo/libmagic/compress.c Sat Sep 6 21:32:32 2008
>>> @@ -80,8 +80,6 @@
>>> { "BZh", 3, { "bzip2", "-cd", NULL }, 1 }, /*
>>> bzip2-ed */
>>> };
>>>
>>> -private size_t ncompr = sizeof(compr) / sizeof(compr[0]);
>>> -
>>> #define NODATA ((size_t)~0)
>>>
>>>
>>> @@ -170,7 +168,7 @@
>>> protected ssize_t
>>> sread(int fd, void *buf, size_t n, int canbepipe)
>>> {
>>> - int rv, cnt;
>>> + int rv;
>>> #ifdef FIONREAD
>>> int t = 0;
>>>

[PHP-CVS] cvs: php-src /ext/session/tests 020.phpt bug41600.phpt

2008-09-07T11:00:00.001-07:00

jani Sun Sep 7 18:00:25 2008 UTC

Modified files:
/php-src/ext/session/tests 020.phpt bug41600.phpt
Log:
MFB

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/020.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/session/tests/020.phpt
diff -u php-src/ext/session/tests/020.phpt:1.6 php-src/ext/session/tests/020.phpt:1.7
--- php-src/ext/session/tests/020.phpt:1.6 Sun Sep 7 00:42:29 2008
+++ php-src/ext/session/tests/020.phpt Sun Sep 7 18:00:25 2008
@@ -6,7 +6,7 @@
session.use_cookies=0
session.cache_limiter=
session.use_trans_sid=1
-arg_separator.output=&
+arg_separator.output="&"
session.name=PHPSESSID
session.serialize_handler=php
session.save_handler=files
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/bug41600.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/session/tests/bug41600.phpt
diff -u php-src/ext/session/tests/bug41600.phpt:1.3 php-src/ext/session/tests/bug41600.phpt:1.4
--- php-src/ext/session/tests/bug41600.phpt:1.3 Thu Aug 23 11:38:56 2007
+++ php-src/ext/session/tests/bug41600.phpt Sun Sep 7 18:00:25 2008
@@ -6,7 +6,7 @@
session.use_cookies=0
session.cache_limiter=
session.use_trans_sid=1
-arg_separator.output=&
+arg_separator.output="&"
session.name=PHPSESSID
session.serialize_handler=php
session.save_handler=files

--
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/session/tests 020.phpt bug41600.phpt

2008-09-07T10:59:00.001-07:00

jani Sun Sep 7 17:59:24 2008 UTC

Modified files: (Branch: PHP_5_3)
/php-src/ext/session/tests 020.phpt bug41600.phpt
Log:
- Revert idiotic patch (hint: Windows IS NOT the most important OS!)

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/020.phpt?r1=1.4.4.1.2.1&r2=1.4.4.1.2.2&diff_format=u
Index: php-src/ext/session/tests/020.phpt
diff -u php-src/ext/session/tests/020.phpt:1.4.4.1.2.1 php-src/ext/session/tests/020.phpt:1.4.4.1.2.2
--- php-src/ext/session/tests/020.phpt:1.4.4.1.2.1 Sun Sep 7 00:42:40 2008
+++ php-src/ext/session/tests/020.phpt Sun Sep 7 17:59:24 2008
@@ -6,7 +6,7 @@
session.use_cookies=0
session.cache_limiter=
session.use_trans_sid=1
-arg_separator.output=&
+arg_separator.output="&"
session.name=PHPSESSID
session.serialize_handler=php
session.save_handler=files
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/bug41600.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/session/tests/bug41600.phpt
diff -u php-src/ext/session/tests/bug41600.phpt:1.1.2.1 php-src/ext/session/tests/bug41600.phpt:1.1.2.1.2.1
--- php-src/ext/session/tests/bug41600.phpt:1.1.2.1 Wed Jun 6 00:00:28 2007
+++ php-src/ext/session/tests/bug41600.phpt Sun Sep 7 17:59:24 2008
@@ -6,7 +6,7 @@
session.use_cookies=0
session.cache_limiter=
session.use_trans_sid=1
-arg_separator.output=&
+arg_separator.output="&"
session.name=PHPSESSID
session.serialize_handler=php
session.save_handler=files

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

2008-09-07T10:57:00.003-07:00

Pierre Joye kirjoitti:
> hi Bjori,
>
> On Sun, Sep 7, 2008 at 3:44 PM, Hannes Magnusson
> <hannes.magnusson@gmail.com> wrote:
>
>> I don't understand...
>> Does arg_separator.output="&" in php.ini not work on windows - or
>> is this a bug in run-tests.php?
>
> It does not. run-tests should take care of escaping the cmd line
> arguments arguments using escapeshellargs. We can then use:
>
> inisetting=&
>
> instead of
>
> inisetting="&"
>
> Especially as " is not always portable.

Just use single quotes then.. where the hell isn't " portable? Windows?
What in this isn't portable???

--Jani

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

2008-09-07T10:57:00.001-07:00

It compiled fine on 5.3, and there is no references to that define. I
think something was not merged into HEAD.

On 6-Sep-08, at 7:12 PM, Felix De Vliegher wrote:

> Hi Ilia
>
> I might be wrong but with removing those, building actually fails
> with me.
>
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c: In
> function 'file_zmagic':
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:106:
> error: 'ncompr' undeclared (first use in this function)
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:106:
> error: (Each undeclared identifier is reported only once
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:106:
> error: for each function it appears in.)
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c: In
> function 'sread':
> /home/felixdv/php/cvs/php6dev/ext/fileinfo/libmagic/compress.c:183:
> error: 'cnt' undeclared (first use in this function)
>
> Regards,
> Felix
>
> Op 6-sep-08, om 23:32 heeft Ilia Alshanetsky het volgende geschreven:
>
>> iliaa Sat Sep 6 21:32:32 2008 UTC
>>
>> Modified files:
>> /php-src/ext/fileinfo/libmagic compress.c
>> Log:
>> MFB: removed unused variables
>>
>>
>> http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/compress.c?r1=1.2&r2=1.3&diff_format=u
>> Index: php-src/ext/fileinfo/libmagic/compress.c
>> diff -u php-src/ext/fileinfo/libmagic/compress.c:1.2 php-src/ext/
>> fileinfo/libmagic/compress.c:1.3
>> --- php-src/ext/fileinfo/libmagic/compress.c:1.2 Tue Aug 26
>> 12:24:12 2008
>> +++ php-src/ext/fileinfo/libmagic/compress.c Sat Sep 6 21:32:32 2008
>> @@ -80,8 +80,6 @@
>> { "BZh", 3, { "bzip2", "-cd", NULL }, 1 }, /* bzip2-ed */
>> };
>>
>> -private size_t ncompr = sizeof(compr) / sizeof(compr[0]);
>> -
>> #define NODATA ((size_t)~0)
>>
>>
>> @@ -170,7 +168,7 @@
>> protected ssize_t
>> sread(int fd, void *buf, size_t n, int canbepipe)
>> {
>> - int rv, cnt;
>> + int rv;
>> #ifdef FIONREAD
>> int t = 0;
>>

Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

2008-09-07T10:54:00.001-07:00

Hannes Magnusson kirjoitti:
> 2008/9/7 Kalle Sommer Nielsen <kalle@php.net>:
>> kalle Sun Sep 7 00:42:29 2008 UTC
>>
>> Modified files:
>> /php-src/ext/session/tests 020.phpt
>> Log:
>> Fix test on Windows
>>
>> http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/020.phpt?r1=1.5&r2=1.6&diff_format=u
>> Index: php-src/ext/session/tests/020.phpt
>> diff -u php-src/ext/session/tests/020.phpt:1.5 php-src/ext/session/tests/020.phpt:1.6
>> --- php-src/ext/session/tests/020.phpt:1.5 Mon Feb 13 10:23:57 2006
>> +++ php-src/ext/session/tests/020.phpt Sun Sep 7 00:42:29 2008
>> @@ -6,7 +6,7 @@
>> session.use_cookies=0
>> session.cache_limiter=
>> session.use_trans_sid=1
>> -arg_separator.output="&"
>> +arg_separator.output=&
>
> Saayyy whaaat?
> This was the php.ini-recommended value, how could that possibly break
> anything on windows?

Just revert this completely bogus nonsense change..

--Jani

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] php image and javascript include

2008-09-07T10:40:00.000-07:00

On 7 Sep 2008, at 18:35, javasac wrote:
> <snip code>

I see no PHP in there. Please post the piece of PHP code you're having
a problem with.

-Stut

--
http://stut.net/

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] Recursive Iteration over a collection of objects

2008-09-07T10:38:00.000-07:00

On Sun, Sep 7, 2008 at 11:05 AM, Jochem Maas <jochem@iamjochem.com> wrote:

> David Lidstone schreef:
>
>> Hi
>>
>> I am getting myself quite confused while trying to use SPL to recursively
>> iterate through a collection of objects, and any help would be greatly
>> appreciated!
>>
>> My collection of objects is contained in a class (which I frequently use
>> to iterate through objects stored in an array in the class), and I think my
>> hasChildren() and getChildren() methods are working ok, but I am unable to
>> make it recursive.
>>
>> I am particularly confused by where I have to use
>> RecursiveIteratorIterator (do I have to at all?),
>>
>
> something like:
>
> $c = new Categories;
> $c->loadAll();
>
> foreach (new RecursiveIteratorIterator($c) as $item)
> var_dump($item);

make sure to pass the appropriate mode when instantiating
RecursiveIteratorIterator; the default is LEAVES_ONLY, which i presume is
not what people want in most cases. here is the list of modes from the spl
docs,

*mode* Operation mode (one of):

- LEAVES_ONLY only show leaves
- SELF_FIRST show parents prior to their childs
- CHILD_FIRST show all children prior to their parent

so, i typically use SELF_FIRST, and then Jochem's example would become,

..
foreach(new RecursiveIteratorIterator($c,
RecursiveIteratorIterator::SELF_FIRST) as $item)
..

-nathan

Re: [PHP] php image and javascript include

2008-09-07T10:35:00.000-07:00

<html>
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
<title>SPIDR</title>
<script language="javascript">
var prev_Item_1d;
prev_Item_1d = '';

var prev_div_Item_1d;
prev_div_Item_1d = '';
function Call_MyFunction(div_Item_1d, item_1d)
{
if(prev_div_Item_1d != '')
{
document.getElementById(prev_div_Item_1d).style.display = 'none';
document.getElementById(prev_Item_1d).style.backgroundImage =
'url(images/login_07.jpg)';
document.getElementById(prev_Item_1d).style.borderBottomColor =
"#808080";
}
if(prev_div_Item_1d == div_Item_1d)
{
prev_div_Item_1d = '';
prev_Item_1d = '';
}
else
{
document.getElementById(div_Item_1d).style.display = '';
document.getElementById(item_1d).style.backgroundImage =
'url(images/main_menu_bgwhite.jpg)';
document.getElementById(item_1d).style.borderBottomColor = "#FFFFFF";
prev_div_Item_1d = div_Item_1d;
prev_Item_1d = item_1d;
setTimeout("On_T1mer()", 5000);
}
}

function On_T1mer()
{
if(prev_div_Item_1d != '')
{
document.getElementById(prev_div_Item_1d).style.display = 'none';
document.getElementById(prev_Item_1d).style.backgroundImage =
'url(images/login_07.jpg)';
document.getElementById(prev_Item_1d).style.borderBottomColor =
"#808080";
prev_div_Item_1d = '';
prev_Item_1d = '';
}
}
</script>
<link href="style.css" rel="stylesheet" type="text/css">
</head>
<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0"
marginheight="0">

<div class="innerTEXT" style="display: none; border-left:1px solid #808080;
border-right:1px solid #808080; border-bottom:1px solid #808080; position:
absolute; width: 168px; z-index: 1; left:91px; top:94px;
background-color:#FFFFFF" id="div_Item2">
<table id="tbl_Top" width="100%" border="0" cellpadding="0"
cellspacing="0">
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 1</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 2</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
</table>
</div>
<div class="innerTEXT" style="display: none; border-left:1px solid #808080;
border-right:1px solid #808080; border-bottom:1px solid #808080; position:
absolute; width: 168px; z-index: 1; left:0px; top:94px;
background-color:#FFFFFF" id="div_Item1">
<table id="tbl_Top" width="100%" border="0" cellpadding="0"
cellspacing="0">
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
<tr height="22px">
<td class="innerTEXT" bgcolor="#FFFFFF"
onmousemove="this.style.backgroundColor = 'darkblue'; this.style.color =
'#FFFFFF';" onmouseout="this.style.backgroundColor =
'#FFFFFF';this.style.color = '#333333';">  Item 3</td>
</tr>
</table>
</div>

<table width="800px" border="0" align="center" cellpadding="0"
cellspacing="0" id="tbl_Top">
<tr>
<td>
<table id="tbl_Logo" width="800px" height="65" border="0"
cellpadding="0" cellspacing="0">
<tr>
<td valign="top" style="background-image:
url('images/logo_image_strech.jpg'); width: 40px"> 
</td>
<td valign="top" style="background-image:
url('images/logo_image_.jpg'); width: 77px">
</td>
<td valign="top" style="background-image:
url('images/logo_image_strech.jpg'); background-repeat: repeat-x"> 
</td>
</tr>
</table>
</td>
</tr>
<tr height="2px">
<td></td>
</tr>
<tr height="25px">
<td valign="top"> <table id="tbl_Logo" width="800"
height="25" border="0" cellpadding="0" cellspacing="0">
<tr>
<td align="center" onclick="Call_MyFunction('div_Item1', 'item_id1');"
id="item_id1" style="border-bottom:1px solid #808080; cursor:hand; width:
92px; background-image: url('images/login_07.jpg'); background-repeat:
repeat-x; " class="innerTEXT">Menu 1 </td>
<td align="center" onclick="Call_MyFunction('div_Item2', 'item_id2');"
id="item_id2" style="border-bottom:1px solid #808080; cursor:hand; width:
92px; background-image: url('images/login_07.jpg'); background-repeat:
repeat-x" class="innerTEXT">Menu 2 </td>
<td align="center" id="item_id3" style="border-bottom:1px solid
#808080; cursor:hand; border-left:1px solid #808080; border-right:1px solid
#808080; width:14.20%; background-image: url('images/main_menu_bg.jpg');
background-repeat: repeat-x; " class="innerTEXT">Menu 3 </td>
<td align="center" id="item_id4" style="border-bottom:1px solid
#808080; cursor:hand; border-left:1px solid #808080; border-right:1px solid
#808080; width:14.20%; background-image: url('images/main_menu_bg.jpg');
background-repeat: repeat-x; " class="innerTEXT">Menu 4 </td>
<td align="center" id="item_id5" style="border-bottom:1px solid
#808080; cursor:hand; border-left:1px solid #808080; border-right:1px solid
#808080; width:14.20%; background-image: url('images/main_menu_bg.jpg');
background-repeat: repeat-x; " class="innerTEXT">Menu 5 </td>
<td align="center" id="item_id6" style="border-bottom:1px solid
#808080; cursor:hand; border-left:1px solid #808080; border-right:1px solid
#808080; width:14.20%; background-image: url('images/main_menu_bg.jpg');
background-repeat: repeat-x; " class="innerTEXT">Menu 6 </td>
<td align="center" id="item_id7" style="border-bottom:1px solid
#808080; cursor:hand; border-left:1px solid #808080; border-right:1px solid
#808080; background-image: url('images/main_menu_bg.jpg');
background-repeat: repeat-x; " class="innerTEXT">Menu 7 </td>
</tr>
<tr height="0" bgcolor="#FFFFFF">
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<table width="100%" height="256" border="0" cellpadding="0"
cellspacing="0" id="tbl_Logo">
<tr>
<td width="494" height="12"></td>
<td height="12" valign="top"></td>
</tr>
<tr>
<td rowspan="2" valign="top"><table width="100%" cellspacing="0"
cellpadding="0">
<tr>
<td width="10"> ./images/box_top_lft.jpg </td>
<td background="../images/box_top_mid.jpg"
class="Login"><table width="100%" cellpadding="0" cellspacing="0"
class="Login">
<tr>
<td><strong>Join Spidr here! </strong></td>
<td><div align="right" class="white">already
a member? <strong>login</strong> </div></td>
</tr>
</table></td>
<td width="11">
C:/wamp/www/yojoe-web/html/site/images/box_top_rht.jpg </td>
</tr>
<tr>
<td height="68" background="images/box_lft.jpg">
images/box_lft.jpg </td>
<td><table width="100%" cellpadding="0"
cellspacing="0" class="blue">
<tr>
<td width="30%" height="14"> </td>
<td width="3%" height="14"> </td>
<td width="67%" height="14"> </td>
</tr>
<tr>
<td height="24">Email Address </td>
<td>:</td>
<td><input name="textfield3" type="text"
class="blue" size="27" maxlength="50"></td>
</tr>
<tr>
<td height="24">Password</td>
<td>:</td>
<td><input name="textfield32" type="text"
class="blue" size="27" maxlength="50"></td>
</tr>
<tr>
<td height="24">Confirm Password </td>
<td>:</td>
<td><input name="textfield33" type="text"
class="blue" size="27" maxlength="50"></td>
</tr>
<tr>
<td height="24" colspan="3"
class="dot"><div
align="center">..........................................................................................................................................................</div></td>
</tr>
<tr>
<td height="24">Display Name </td>
<td>:</td>
<td><input name="textfield332" type="text"
class="blue" size="27" maxlength="50"></td>
</tr>
<tr>
<td height="24">First Name </td>
<td>:</td>
<td><input name="textfield333" type="text"
class="blue" size="27" maxlength="50"></td>
</tr>
<tr>
<td height="24">Last Name </td>
<td>:</td>
<td><input name="textfield334" type="text"
class="blue" size="27" maxlength="50"></td>
</tr>
<tr>
<td height="24">Country</td>
<td>:</td>
<td><select name="select" class="blue">
<option selected>Select
Country</option>
</select></td>
</tr>
<tr>
<td height="24">State</td>
<td>:</td>
<td><select name="select2" class="blue">
<option selected>Select
Country</option>
</select></td>
</tr>
<tr>
<td height="24">Post Code </td>
<td>:</td>
<td><input name="textfield337" type="text"
class="blue" size="27" maxlength="50"></td>
</tr>
<tr>
<td height="24" colspan="3"
class="dot"><div
align="center">..........................................................................................................................................................</div></td>
</tr>
<tr>
<td height="24">Date of Birth </td>
<td>:</td>
<td><select name="select3" class="blue">
<option selected>Date</option>
</select>
<select name="select4" class="blue">
<option selected>Day</option>
</select>
<select name="select5" class="blue">
<option selected>Year</option>
</select></td>
</tr>
<tr>
<td height="24"> </td>
<td> </td>
<td><input name="checkbox2"
type="checkbox" class="blue" value="checkbox">
Allow others to see when it's my
birthday.</td>
</tr>
<tr>
<td height="24">Gender</td>
<td>:</td>
<td><input name="radiobutton" type="radio"
class="blue" value="radiobutton">
Male
<input name="radiobutton" type="radio" class="blue"
value="radiobutton">
Female</td>
</tr>
<tr>
<td height="24">Language</td>
<td>:</td>
<td><select name="select6" class="blue">
<option selected>language</option>
</select></td>
</tr>
<tr>
<td height="24" colspan="3"
class="dot"><div
align="center">..........................................................................................................................................................</div></td>
</tr>
<tr>
<td height="24">Verification</td>
<td>:</td>
<td>Dynamic image
                  
images/refresh.jpg </td>
</tr>
<tr>
<td height="24"> </td>
<td> </td>
<td><input name="textfield3372"
type="text" class="blue" size="27" maxlength="50"></td>
</tr>
<tr>
<td height="24" colspan="3"><input
name="checkbox22" type="checkbox" class="blue" value="checkbox">
By checking the box, you confirm that :
</td>
</tr>
<tr>
<td height="24" colspan="3"><div
align="center"> images/reset.jpg      images/signin.jpg
</div></td>
</tr>
<tr>
<td height="24"> </td>
<td> </td>
<td> </td>
</tr>
</table></td>
<td background="images/box_rht.jpg">
images/box_rht.jpg </td>
</tr>
<tr>
<td width="10" height="7">
images/box_bottom_lft.jpg </td>
<td height="7"
background="images/box_bottom_mid.jpg"> images/box_bottom_mid.jpg </td>
<td> images/box_bottom_rht.jpg </td>
</tr>
</table></td>
<td width="306" height="203" valign="top"><table width="100%"
cellspacing="0" cellpadding="0">
<tr>
<td width="306" height="203" valign="top"
background="images/login_17.jpg"><table width="95%" align="center"
cellpadding="1" cellspacing="0">
<tr>
<td width="33%" height="36"
class="Login"><div align="center">Log In</div></td>
<td colspan="2" class="signup"><div
align="left">          Sign
Up! </div></td>
</tr>
<tr>
<td height="12" class="Login"></td>
<td width="29%" class="signup"></td>
<td width="38%" class="signup"></td>
</tr>
<tr>
<td height="36" class="Login"><div
align="right">User Id : </div></td>
<td height="36" colspan="2"
class="signup"><div align="center">
<input name="textfield" type="text"
class="blue" size="27" maxlength="50">
</div></td>
</tr>
<tr>
<td height="36" class="Login"><div
align="right">Password : </div></td>
<td height="36" colspan="2"
class="signup"><div align="center">
<input name="textfield2" type="text"
class="blue" size="27" maxlength="50">
</div></td>
</tr>
<tr>
<td class="Login"> </td>
<td class="signup"> </td>
<td class="signup"> </td>
</tr>
<tr>
<td colspan="2" class="Login"><input
name="checkbox" type="checkbox" class="blue" value="checkbox">
Remember Me </td>
<td class="signup"><div align="right"> #
images/login.png    </div></td>
</tr>
<tr>
<td class="Login"> </td>
<td colspan="2" class="signup"><div
align="right"> # Forgot your password?  </div></td>
</tr>
</table></td>
</tr>
</table></td>
</tr>
<tr>
<td valign="top"> </td>
</tr>
<tr>
<td> </td>
<td valign="top"> </td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>

--
View this message in context: http://www.nabble.com/php-image-and-javascript-include-tp19357706p19360501.html
Sent from the PHP - General mailing list archive at Nabble.com.

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: CVSROOT / avail

2008-09-07T10:33:00.002-07:00

helly Sun Sep 7 17:33:54 2008 UTC

Modified files:
/CVSROOT avail
Log:
- Upgrade Felipe

http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1445&r2=1.1446&diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1445 CVSROOT/avail:1.1446
--- CVSROOT/avail:1.1445 Thu Sep 4 09:05:09 2008
+++ CVSROOT/avail Sun Sep 7 17:33:53 2008
@@ -92,7 +92,7 @@
avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp|pecl

# access to gcov.php.net website.
-avail|helly,ilia,nlopess,pronych,felixdv|php-gcov-web
+avail|helly,ilia,nlopess,pronych,felixdv,felipe|php-gcov-web

# The PHP-GTK Group has access to the PHP-GTK code and documentation.

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-QA] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

2008-09-07T10:33:00.001-07:00

On Sun, Sep 7, 2008 at 7:01 PM, Hannes Magnusson
<hannes.magnusson@gmail.com> wrote:
> On Sun, Sep 7, 2008 at 16:40, Pierre Joye <pierre.php@gmail.com> wrote:
>> On Sun, Sep 7, 2008 at 4:13 PM, Hannes Magnusson
>> <hannes.magnusson@gmail.com> wrote:
>>
>>> ; The separator used in PHP generated URLs to separate arguments.
>>> ; Default is "&".
>>> ;arg_separator.output = "&"
>>>
>>>
>>> Is this the same bug as \ in doublequotes bug/feature?
>>
>> Not sure which bug/feature you are refering to. But the problem here
>> is to use double quotes in the ini settings section of a phpt as
>> escape characters instead of using escapeshellargs in run-tests.php
>
>
> Ahh!
>
> So:
>>> Does arg_separator.output="&" in php.ini not work on windows - or
>>> is this a bug in run-tests.php?
>>
>> It does not. run-tests should take care of escaping the cmd line
>> arguments arguments using escapeshellargs. We can then use:
>
> The "It does not [work]" is wrong. It *does* work in *php.ini*, just
> not in run-tests.php?

Not sure if it works in php.ni as I did not test it :)

run-tests.php calls php.exe and passes it the ini arguments using the
-d cmd line option, and the double quotes are wrongly interpreted.

My patch fixes the issue but I did not get the time to dig through all
tests to remove the unnecessary double quotes. It would rock if
someone from the QA team could give me a hand :)

Cheers,
--
Pierre

http://blog.thepimp.net | http://www.libgd.org

--
PHP Quality Assurance Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] php image and javascript include

2008-09-07T10:20:00.000-07:00

Thanks for the reply. here is the php file.
I am using wamp server 2.0 http://www.nabble.com/file/p19360339/signin.jpg
signin.jpg

Ashley Sheridan-3 wrote:
>
> Do you have an excerpt of the PHP code you have preceeding the HTML you
> are using to include the JavaScript & images?
>
>
> Ash
> www.ashleysheridan.co.uk
>
>
> Hi All,
>
> Strange issue here. I m including images and javascript in my php file.
> None
> of them show/work up.
> If i change the .php file to .html, both thing start working. So no issues
> with path and all.
>
> Any idea?
>
> Thanks,
> Sachin
> --
> View this message in context:
> http://www.nabble.com/php-image-and-javascript-include-tp19357706p19357706.html
> Sent from the PHP - General mailing list archive at Nabble.com.
>
>
> --
> PHP General Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
>
> --
> PHP General Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
http://www.nabble.com/file/p19360339/signup.php signup.php
--
View this message in context: http://www.nabble.com/php-image-and-javascript-include-tp19357706p19360339.html
Sent from the PHP - General mailing list archive at Nabble.com.

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] Recursive Iteration over a collection of objects

2008-09-07T10:05:00.000-07:00

David Lidstone schreef:
> Hi
>
> I am getting myself quite confused while trying to use SPL to
> recursively iterate through a collection of objects, and any help would
> be greatly appreciated!
>
> My collection of objects is contained in a class (which I frequently use
> to iterate through objects stored in an array in the class), and I think
> my hasChildren() and getChildren() methods are working ok, but I am
> unable to make it recursive.
>
> I am particularly confused by where I have to use
> RecursiveIteratorIterator (do I have to at all?),

something like:

$c = new Categories;
$c->loadAll();

foreach (new RecursiveIteratorIterator($c) as $item)
var_dump($item);

> and the getIterator()
> method (again, do I need it and why?). Am I going about this totally the
> wrong way to start with?
>
> I have tried to summarise my code below. Sorry for the long post, and
> thanks again.
>
> David
>
>
> ====== Script... ==========
>
> $categories = new RecursiveIteratorIterator(new Categories);
> $categories->loadAll();
>
> foreach ($categories as $category) {
> echo 'ID: ' . $category->getID();
> echo 'Level: ' . $category->getLevel();
> }
>
>
> ======= classes... =========
>
> abstract class ObjCollection implements RecursiveIterator {
> // class stores objects in an array
> public $objs = array();
> public function current();
> public function hasChildren();
> // etc etc
> }
>
>
> class Categories extends ObjCollection {
> // concrete class which loads the Category objects into
> // the ObjCollection array
> public function loadAll() {// ...load Category classes
> // into parent:: !}
> }
>
>
> class Category {
> private $id;
> private $level
> public function getID() {return $this->id;}
> public function getLevel() {return $this->level;}
> }
>
>
>
>

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] Length of Exception text?

2008-09-07T09:56:00.000-07:00

ANR Daemon schreef:
> Greetings, All.
>
> I've been working on some PEAR-based app last week and I ran into problem.
> While I debugging app, my backtrace always trimmed at some point.
> First time I though it was my mistake, and switched back to standard
> "Exception" class.
> But nothing changed.
>
> If I print everything by hands, it's all full and good, but if I let PHP print

what do you mean by:

1. print by hand
2. let PHP print

> exception message, it getting trimmed at 1015 characters, rendering backtrace
> almost useless.
> Say, only my own code producing 4-5 lines, PEAR stuff adding about 8, plus
> converting PEAR_Error to Exception at least 2 lines. All-in-all, up to 15
> lines so far, and backtrace trimmed at 6'th or 7'th line.
> Is there any way to affect this behaviour without recompiling PHP?
>
>

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Prathan, theres something BIG on the horizon...

2008-09-07T09:48:00.001-07:00

Prathan,

we've all heard of Adsense, and we've all heard some
pretty incredible claims of income too, right?

(BTW - Check out this Adsense video - 74,991 earnings a month)

>> www.AdsenseWealthEmpire.com <<

But many of the so called "experts" would have you believe
that Adsense is a "loser". That there's no more money to
be made with it at all.

Now why would they say that? Google is setting records
with the program almost daily, and they pay over 75% of
Adsense revenues to their publishers. It's pure nonsense.

>> www.AdsenseWealthEmpire.com <<

There's a LOT of money being made.

Well, by thinning the new herd (you), the "experts" hope to
keep more of the money, for themselves. And keep you out of it.

Pretty much that simple...

Well you don't have to stand for it, because two 6 figure
AdSense experts are about to do the unthinkable and unleash
their secrets to the world on Monday, September 08, 8:00 AM PST.

Hundreds of sharp marketers already snapped up their last
AdSense system at $2000.

>> www.AdsenseWealthEmpire.com <<

It sold like crazy because it made people a lot of money.
Truckloads of cash.

But at a $2000 pricepoint, they noticed that an awful lot
of deserving marketers were being left out in the cold, and
that made them feel bad.

These are two terrific guys and they really do want to see
others succeed along with them.

They knew they had to do something to help out those
marketers that didn't make it in.

So they decided to do something unheard of, and re-tooled
their wildly successful product to put it into the reach of
anyone that was willing to commit to their own success.

>> www.AdsenseWealthEmpire.com <<

To give other smart and deserving marketers a chance to
compete nose to nose with the "big dogs".

At a price point that will make you think they have gone
stark raving mad.

And they're almost done...

But be aware - when this breaks, it is going to go so screaming
fast that if you blink, the opportunity will be gone like a
politician's promise.

Check out this video - they show you how they make more
than $74,000 a month

>> www.AdsenseWealthEmpire.com <<

and keep your eyes peeled for the 8th of September, 2008.

To Your Success,

Dan Misiok
1clickaffiliate.com

>> www.AdsenseWealthEmpire.com <<

...

1 Click Affiliate (TM)
Case Postale 1385
Geneve 1, 1211,
Switzerland

To unsubscribe or change subscriber options visit:
http://www.aweber.com/z/r/?zJwsDBwstMwcDMysrMwMtEa0zOwcjJwcDA==

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c

2008-09-07T07:18:00.001-07:00

lbarnaud Sun Sep 7 14:18:12 2008 UTC

Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/main rfc1867.c
Log:
MFH: More accurate max_file_size / upload_max_filesize (fixes #45124)

http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1214&r2=1.2027.2.547.2.1215&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1214 php-src/NEWS:1.2027.2.547.2.1215
--- php-src/NEWS:1.2027.2.547.2.1214 Sat Sep 6 17:19:15 2008
+++ php-src/NEWS Sun Sep 7 14:18:11 2008
@@ -69,6 +69,8 @@
(Dmitry)
- Fixed bug #45139 (ReflectionProperty returns incorrect declaring class).
(Felipe)
+- Fixed bug #45124 ($_FILES['upload']['size'] sometimes return zero and
+ sometimes the filesize). (Arnaud)
- Fixed bug #45028 (CRC32 output endianness is different between crc32()
and hash()). (Tony)
- Fixed bug #45004 (pg_insert() does not accept 4 digit timezone format).
http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.173.2.1.2.12&r2=1.173.2.1.2.13&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.173.2.1.2.12 php-src/main/rfc1867.c:1.173.2.1.2.13
--- php-src/main/rfc1867.c:1.173.2.1.2.12 Sat Sep 6 17:19:15 2008
+++ php-src/main/rfc1867.c Sun Sep 7 14:18:11 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: rfc1867.c,v 1.173.2.1.2.12 2008/09/06 17:19:15 lbarnaud Exp $ */
+/* $Id: rfc1867.c,v 1.173.2.1.2.13 2008/09/07 14:18:11 lbarnaud Exp $ */

/*
* This product includes software developed by the Apache Group
@@ -1077,12 +1077,12 @@
}

- if (PG(upload_max_filesize) > 0 && total_bytes > PG(upload_max_filesize)) {
+ if (PG(upload_max_filesize) > 0 && (total_bytes+blen) > PG(upload_max_filesize)) {
#if DEBUG_FILE_UPLOAD
sapi_module.sapi_error(E_NOTICE, "upload_max_filesize of %ld bytes exceeded - file [%s=%s] not saved", PG(upload_max_filesize), param, filename);

[PHP-CVS] cvs: php-src(PHP_5_3) /main rfc1867.c

2008-09-07T07:17:00.002-07:00

lbarnaud Sun Sep 7 14:17:47 2008 UTC

Modified files: (Branch: PHP_5_3)
/php-src/main rfc1867.c
Log:
MFH: More accurate max_file_size / upload_max_filesize (fixes #45124)

http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.173.2.1.2.9.2.3&r2=1.173.2.1.2.9.2.4&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.173.2.1.2.9.2.3 php-src/main/rfc1867.c:1.173.2.1.2.9.2.4
--- php-src/main/rfc1867.c:1.173.2.1.2.9.2.3 Sat Sep 6 17:18:40 2008
+++ php-src/main/rfc1867.c Sun Sep 7 14:17:47 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: rfc1867.c,v 1.173.2.1.2.9.2.3 2008/09/06 17:18:40 lbarnaud Exp $ */
+/* $Id: rfc1867.c,v 1.173.2.1.2.9.2.4 2008/09/07 14:17:47 lbarnaud Exp $ */

/*
* This product includes software developed by the Apache Group
@@ -1077,12 +1077,12 @@
}

- if (PG(upload_max_filesize) > 0 && total_bytes > PG(upload_max_filesize)) {
+ if (PG(upload_max_filesize) > 0 && (total_bytes+blen) > PG(upload_max_filesize)) {
#if DEBUG_FILE_UPLOAD
sapi_module.sapi_error(E_NOTICE, "upload_max_filesize of %ld bytes exceeded - file [%s=%s] not saved", PG(upload_max_filesize), param, filename);

[PHP-CVS] cvs: php-src /main rfc1867.c

2008-09-07T07:17:00.001-07:00

lbarnaud Sun Sep 7 14:17:24 2008 UTC

Modified files:
/php-src/main rfc1867.c
Log:
More accurate max_file_size / upload_max_filesize (fixes #45124)

http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.196&r2=1.197&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.196 php-src/main/rfc1867.c:1.197
--- php-src/main/rfc1867.c:1.196 Sat Sep 6 17:17:44 2008
+++ php-src/main/rfc1867.c Sun Sep 7 14:17:24 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: rfc1867.c,v 1.196 2008/09/06 17:17:44 lbarnaud Exp $ */
+/* $Id: rfc1867.c,v 1.197 2008/09/07 14:17:24 lbarnaud Exp $ */

/*
* This product includes software developed by the Apache Group
@@ -1335,12 +1335,12 @@
}

- if (PG(upload_max_filesize) > 0 && total_bytes > PG(upload_max_filesize)) {
+ if (PG(upload_max_filesize) > 0 && (total_bytes+blen) > PG(upload_max_filesize)) {
#if DEBUG_FILE_UPLOAD
sapi_module.sapi_error(E_NOTICE, "upload_max_filesize of %ld bytes exceeded - file [%r=%r] not saved", PG(upload_max_filesize), param, filename);

[PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

2008-09-07T07:14:00.000-07:00

(sorry for the double post Pierre, hit the wrong button)

On Sun, Sep 7, 2008 at 16:11, Pierre Joye <pierre.php@gmail.com> wrote:
> hi Bjori,
>
> On Sun, Sep 7, 2008 at 3:44 PM, Hannes Magnusson
> <hannes.magnusson@gmail.com> wrote:
>
>> I don't understand...
>> Does arg_separator.output="&" in php.ini not work on windows - or
>> is this a bug in run-tests.php?
>
> It does not. run-tests should take care of escaping the cmd line
> arguments arguments using escapeshellargs. We can then use:
>
> inisetting=&
>
> instead of
>
> inisetting="&"
>
> Especially as " is not always portable.

; The separator used in PHP generated URLs to separate arguments.
; Default is "&".
;arg_separator.output = "&"

Is this the same bug as \ in doublequotes bug/feature?

-Hannes

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

2008-09-07T07:11:00.001-07:00

hi Bjori,

On Sun, Sep 7, 2008 at 3:44 PM, Hannes Magnusson
<hannes.magnusson@gmail.com> wrote:

> I don't understand...
> Does arg_separator.output="&" in php.ini not work on windows - or
> is this a bug in run-tests.php?

It does not. run-tests should take care of escaping the cmd line
arguments arguments using escapeshellargs. We can then use:

inisetting=&

instead of

inisetting="&"

Especially as " is not always portable.

Cheers,
--
Pierre

http://blog.thepimp.net | http://www.libgd.org

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-DEV] Could somebody with ZE2 karma please commit this? (was: [RFC] [PATCH] Rounding in PHP)

2008-09-07T06:49:00.000-07:00

Hi,

> @internals: Anyway, since nobody of the core devs seems to be interested
> in this topic, is there any objection to me committing this patch to HEAD?

Since I received no answer, I assumed that nobody would object and tried
to commit my patch to HEAD. Problem is that I don't have ZE2 karma and
since my patch touches zend_strtod.[ch] too, my commit failed.

I isolated the ZE2 parts of the patch so they can be applied separately
so that somebody with ZE2 karma can commit it:

http://www.christian-seiler.de/temp/php/2008-08-23-rounding/ze2.patch

For an explanation for everyone that hasn't read my rounding RFC, the
ZE2 part of the patch does the following:

- Define some macros in zend_strtod.h that set the FPU control registers
to always use double precision (and not double extended precision)
when performing calculations.
- Add necessary configure checks for Unix based systems to see if the
required mechanism is present.
- Define the correct constant in the Windows build system (MSVC always
defines _controlfp_s)
- Modify zend_strtod() that it uses these macros.

The macros are defined in zend_strtod.h because I also need them in
ext/standard/math.c.

The reason for the need to fix zend_strtod() is that it currently
behaves like strtod() on most systems but like (double)strtold() on x86
UNIX with GCC (see my RFC for details why that's not the same).

For the record, the complete patch I tried to commit (I'll commit the
rest myself):
http://www.christian-seiler.de/temp/php/2008-08-23-rounding/rounding-head.patch

I'd really appreciate it if someone could commit the ZE2 parts. Thanks!

Regards,
Christian

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

2008-09-07T06:44:00.001-07:00

On Sun, Sep 7, 2008 at 15:30, Pierre Joye <pierre.php@gmail.com> wrote:
> hi Kalle,
>
> On Sun, Sep 7, 2008 at 3:13 PM, Hannes Magnusson
> <hannes.magnusson@gmail.com> wrote:
>> 2008/9/7 Kalle Sommer Nielsen <kalle@php.net>:
>>> kalle Sun Sep 7 00:42:29 2008 UTC
>>>
>>> Modified files:
>>> /php-src/ext/session/tests 020.phpt
>>> Log:
>>> Fix test on Windows
>>>
>>> http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/020.phpt?r1=1.5&r2=1.6&diff_format=u
>>> Index: php-src/ext/session/tests/020.phpt
>>> diff -u php-src/ext/session/tests/020.phpt:1.5 php-src/ext/session/tests/020.phpt:1.6
>>> --- php-src/ext/session/tests/020.phpt:1.5 Mon Feb 13 10:23:57 2006
>>> +++ php-src/ext/session/tests/020.phpt Sun Sep 7 00:42:29 2008
>>> @@ -6,7 +6,7 @@
>>> session.use_cookies=0
>>> session.cache_limiter=
>>> session.use_trans_sid=1
>>> -arg_separator.output="&"
>>> +arg_separator.output=&
>
> That's the wrong fix and it certainly breaks on non windows now. The
> correct fix has been posted to internals and QA some weeks ago. If we
> drop the quotes in the ini section, we can then use escapeshellargs in
> run-tests.php, that's cleaner, safer and more portable.

I don't understand...
Does arg_separator.output="&" in php.ini not work on windows - or
is this a bug in run-tests.php?

-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/session/tests 020.phpt

2008-09-07T06:13:00.001-07:00

2008/9/7 Kalle Sommer Nielsen <kalle@php.net>:
> kalle Sun Sep 7 00:42:29 2008 UTC
>
> Modified files:
> /php-src/ext/session/tests 020.phpt
> Log:
> Fix test on Windows
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/020.phpt?r1=1.5&r2=1.6&diff_format=u
> Index: php-src/ext/session/tests/020.phpt
> diff -u php-src/ext/session/tests/020.phpt:1.5 php-src/ext/session/tests/020.phpt:1.6
> --- php-src/ext/session/tests/020.phpt:1.5 Mon Feb 13 10:23:57 2006
> +++ php-src/ext/session/tests/020.phpt Sun Sep 7 00:42:29 2008
> @@ -6,7 +6,7 @@
> session.use_cookies=0
> session.cache_limiter=
> session.use_trans_sid=1
> -arg_separator.output="&"
> +arg_separator.output=&

Saayyy whaaat?
This was the php.ini-recommended value, how could that possibly break
anything on windows?

-Hannes

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DOC] SQL Injection link

2008-09-07T05:52:00.000-07:00

On Sun, Sep 7, 2008 at 11:03, Richard Quadling <rquadling@googlemail.com> wrote:
> Hi.
>
> In sort of response to #46011, should ALL functions which can alter a
> database have the link to
> http://php.net/manual/en/security.database.sql-injection.php as part
> of a Warning rather than just a note and have the warning much higher
> up the page? Or at least before the examples.

A <warning> sounds nice, but I think it should be where we always keep
them (the notes section).
A seealso to the escape function should obviously be linked too.

-Hannes

[PHP-DEV] Critical bugs to fix before ANY release

2008-09-07T04:33:00.001-07:00

There are some bugs that have to be fixed before any actual release can be even
dreamed of: http://bugs.php.net/search.php?cmd=display&status=Critical

Note that 2 of those even have patches attached to fix them..

--Jani

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-DOC] Notes Status, 21043 total

2008-09-07T04:32:00.000-07:00

Following are the top 20 pages of the manual, sorted by the number
of user notes contributed. These sections could use a polish, those
notes represent 7.4% of the 21043 total user notes.

Notes | Page
-------+---------------------------------------------------------
88 | http://php.net/manual/en/function.mssql-connect.php
87 | http://php.net/manual/en/function.header.php
86 | http://php.net/manual/en/function.round.php
80 | http://php.net/manual/en/ref.curl.php
80 | http://php.net/manual/en/function.exec.php
80 | http://php.net/manual/en/function.htmlentities.php
79 | http://php.net/manual/en/ref.mail.php
77 | http://php.net/manual/en/function.fgetcsv.php
76 | http://php.net/manual/en/ref.simplexml.php
76 | http://php.net/manual/en/function.strpos.php
75 | http://php.net/manual/en/features.file-upload.php
75 | http://php.net/manual/en/function.setcookie.php
74 | http://php.net/manual/en/language.variables.scope.php
74 | http://php.net/manual/en/function.strip-tags.php
74 | http://php.net/manual/en/function.wordwrap.php
74 | http://php.net/manual/en/function.eval.php
74 | http://php.net/manual/en/ref.com.php
74 | http://php.net/manual/en/ref.mssql.php
74 | http://php.net/manual/en/function.date.php
73 | http://php.net/manual/en/function.flock.php

Re: [PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

2008-09-07T03:17:00.000-07:00

On Sun, 7 Sep 2008, Felix De Vliegher wrote:

> Hi Ilia
>
> I might be wrong but with removing those, building actually fails with me.

hmm, that would mean that the big fileinfo patch was not merged to
HEAD...

regards,
Derick

--
HEAD before 5_3!: http://tinyurl.com/6d2esb
http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-DOC] SQL Injection link

2008-09-07T02:03:00.001-07:00

Hi.

In sort of response to #46011, should ALL functions which can alter a
database have the link to
http://php.net/manual/en/security.database.sql-injection.php as part
of a Warning rather than just a note and have the warning much higher
up the page? Or at least before the examples.

--
-----
Richard Quadling
Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731
"Standing on the shoulders of some very clever giants!"

[PHP-DEV] Regression on constructor calls

2008-09-07T00:34:00.000-07:00

Calling a not defined constructor produce an error in PHP 5.3.0 alpha2
(200809070630 snapshot) when it work in php <= 5.2.6 calling the parent one.

Ok using constructor with class name is a compatibility behaviour and
using __construct don't have this issue. But this regression could
introduce breakage of old apps.

Regards
Remi

Simple test :
<?php
class newA {
function __construct () {
echo "from New A\n";
}
}
class newB extends newA {
}
class newC extends newB {
function __construct () {
parent::__construct();
echo "from New C\n";
}
}
class oldA {
function oldA () {
echo "from Old A\n";
}
}
class oldB extends oldA {
}
class oldC extends oldB {
function oldC () {
parent::oldB();
echo "from Old C\n";
}
}
echo "PHP Version : " . phpversion() . "\n";
$toto = new newC();
$toto = new oldC();
?>

PHP Version : 5.2.6
from New A
from New C
from Old A
from Old C

PHP Version : 5.3.0alpha3-dev
from New A
from New C
PHP Fatal error: Call to undefined method oldB::oldB() in
/home/remif9/test/cons.php on line 24

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-INSTALL] PHP installing on LINUX

2008-09-06T21:43:00.000-07:00

Hello sir,

I want to work on lamp. so could you please tell me what to do for installing php on linux.
I have REDHAT version 5 installed on my system.

Please guide me to do this.

Thanks & Regards
Veerpartap
( PHP Devloper )

[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

2008-09-06T21:17:00.001-07:00

felipe Sun Sep 7 04:17:22 2008 UTC

Modified files:
/php-src/ext/fileinfo/libmagic compress.c
Log:
- Fix build

http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/compress.c?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/fileinfo/libmagic/compress.c
diff -u php-src/ext/fileinfo/libmagic/compress.c:1.3 php-src/ext/fileinfo/libmagic/compress.c:1.4
--- php-src/ext/fileinfo/libmagic/compress.c:1.3 Sat Sep 6 21:32:32 2008
+++ php-src/ext/fileinfo/libmagic/compress.c Sun Sep 7 04:17:22 2008
@@ -80,6 +80,8 @@
{ "BZh", 3, { "bzip2", "-cd", NULL }, 1 }, /* bzip2-ed */
};

+private size_t ncompr = sizeof(compr) / sizeof(compr[0]);
+
#define NODATA ((size_t)~0)

@@ -180,6 +182,8 @@
#ifdef FIONREAD
if ((canbepipe && (ioctl(fd, FIONREAD, &t) == -1)) || (t == 0)) {
#ifdef FD_ZERO
+ int cnt;
+
for (cnt = 0;; cnt++) {
fd_set check;
struct timeval tout = {0, 100 * 1000};

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP] Re: Geometrical library

2008-09-06T20:26:00.000-07:00

Le samedi 06 septembre 2008 à 23:09 -0300, Manuel Lemos a écrit :
> Hello,
>
> on 09/03/2008 01:54 PM Yannick Warnier said the following:
> > Hi there,
> >
> > I've been looking for a PHP library that would allow me to calculate
> > superpositions of geometrical surfaces defined by polygones (defined
> > themselves by points bound with lines) in 2D (surface of a polygone,
> > intersections between two vectors, surface of intersection - considering
> > the polygons could be complex and superpose themselves in more than one
> > point).
> >
> > The closest to what I'm looking for, I guess, would be the PEAR
> > Math_Vector package, but it is mainly based on vectors as mathematical
> > arrays, whereas I would need calculations based on surfaces.
> >
> > Does anyone know of something that could help me?
>
> I think this PHP class does exactly what you need:
>
> http://www.phpclasses.org/polygon

Seems to be pretty much everything I needed, indeed. Pretty hard to find
through Google though. Thank you *very* much.

Yannick

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap soap.c /ext/soap/tests/bugs bug31755.phpt

2008-09-06T19:58:00.000-07:00

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.19&r2=1.156.2.28.2.30.2.20&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.19 php-src/ext/soap/soap.c:1.156.2.28.2.30.2.20
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.19 Mon Sep 1 14:55:30 2008
+++ php-src/ext/soap/soap.c Sun Sep 7 02:58:50 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.30.2.19 2008/09/01 14:55:30 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.20 2008/09/07 02:58:50 felipe Exp $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -887,10 +887,10 @@
int name_length;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs", &data, &name, &name_length) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}
if (name_length == 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid parameter name.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameter name");
}

#ifndef ZEND_ENGINE_2
@@ -912,13 +912,13 @@
zend_bool must_understand = 0;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|zbz", &ns, &ns_len, &name, &name_len, &data, &must_understand, &actor) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}
if (ns_len == 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid namespace.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid namespace");
}
if (name_len == 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid header name.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid header name");
}

add_property_stringl(this_ptr, "namespace", ns, ns_len, 1);
@@ -939,7 +939,7 @@
} else if (Z_TYPE_P(actor) == IS_STRING && Z_STRLEN_P(actor) > 0) {
add_property_stringl(this_ptr, "actor", Z_STRVAL_P(actor), Z_STRLEN_P(actor), 1);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid actor.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid actor");
}
}

@@ -956,8 +956,9 @@
&fault_string, &fault_string_len,
&fault_actor, &fault_actor_len,
&details, &name, &name_len, &headerfault) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}
+
if (Z_TYPE_P(code) == IS_NULL) {
} else if (Z_TYPE_P(code) == IS_STRING) {
fault_code = Z_STRVAL_P(code);
@@ -974,13 +975,13 @@
fault_code = Z_STRVAL_PP(t_code);
fault_code_len = Z_STRLEN_PP(t_code);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid fault code");
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid fault code");
}
if (fault_code != NULL && fault_code_len == 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid fault code");
}
if (name != NULL && name_len == 0) {
name = NULL;
@@ -1048,7 +1049,7 @@
int stype_len, ns_len, name_len, namens_len;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!z|ssss", &data, &type, &stype, &stype_len, &ns, &ns_len, &name, &name_len, &namens, &namens_len) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

if (Z_TYPE_P(type) == IS_NULL) {
@@ -1205,7 +1206,7 @@
PHP_METHOD(SoapServer, SoapServer)
{
soapServicePtr service;
- zval *wsdl, *options = NULL;
+ zval *wsdl = NULL, *options = NULL;
int ret;
int version = SOAP_1_1;
long cache_wsdl;
@@ -1213,15 +1214,8 @@

SOAP_SERVER_BEGIN_CODE();

- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|a", &wsdl, &options) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
- }
-
- if (Z_TYPE_P(wsdl) == IS_STRING) {
- } else if (Z_TYPE_P(wsdl) == IS_NULL) {
- wsdl = NULL;
- } else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!|a", &wsdl, &options) == FAILURE) {
+ return;
}

service = emalloc(sizeof(soapService));
@@ -1245,7 +1239,7 @@
Z_TYPE_PP(tmp) == IS_STRING) {
service->uri = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
} else if (wsdl == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. 'uri' option is required in nonWSDL mode.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "'uri' option is required in nonWSDL mode");
return;
}

@@ -1260,7 +1254,7 @@

encoding = xmlFindCharEncodingHandler(Z_STRVAL_PP(tmp));
if (encoding == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. Invalid 'encoding' option - '%s'.", Z_STRVAL_PP(tmp));
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid 'encoding' option - '%s'", Z_STRVAL_PP(tmp));
} else {
service->encoding = encoding;
}
@@ -1297,7 +1291,7 @@
}

} else if (wsdl == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid arguments. 'uri' option is required in nonWSDL mode.");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "'uri' option is required in nonWSDL mode");
}

service->version = version;
@@ -1430,7 +1424,7 @@
FETCH_THIS_SERVICE(service);

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &obj) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

service->type = SOAP_OBJECT;
@@ -1507,7 +1501,7 @@
FETCH_THIS_SERVICE(service);

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &function_name) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

/* TODO: could use zend_is_callable here */
@@ -1613,8 +1607,9 @@

FETCH_THIS_SERVICE(service);
SOAP_GLOBAL(soap_version) = service->version;
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &arg, &arg_len) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

if (SG(request_info).request_method &&
@@ -2145,7 +2140,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|szs",
&code, &code_len, &string, &string_len, &actor, &actor_len, &details,
&name, &name_len) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

soap_server_fault(code, string, actor, details, name TSRMLS_CC);
@@ -2168,7 +2163,7 @@
}

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &fault, soap_header_class_entry) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

p = service->soap_headers_ptr;
@@ -2495,7 +2490,6 @@
SOAP_CLIENT_BEGIN_CODE();

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|a", &wsdl, &options) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
return;
}

@@ -3018,30 +3012,26 @@

HashPosition pos;

- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|zzz",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a!zz",
&function, &function_len, &args, &options, &headers, &output_headers) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

if (options) {
- if (Z_TYPE_P(options) == IS_ARRAY) {
- HashTable *ht = Z_ARRVAL_P(options);
- if (zend_hash_find(ht, "location", sizeof("location"), (void**)&tmp) == SUCCESS &&
- Z_TYPE_PP(tmp) == IS_STRING) {
- location = Z_STRVAL_PP(tmp);
- }
+ HashTable *ht = Z_ARRVAL_P(options);
+ if (zend_hash_find(ht, "location", sizeof("location"), (void**)&tmp) == SUCCESS &&
+ Z_TYPE_PP(tmp) == IS_STRING) {
+ location = Z_STRVAL_PP(tmp);
+ }

- if (zend_hash_find(ht, "soapaction", sizeof("soapaction"), (void**)&tmp) == SUCCESS &&
- Z_TYPE_PP(tmp) == IS_STRING) {
- soap_action = Z_STRVAL_PP(tmp);
- }
+ if (zend_hash_find(ht, "soapaction", sizeof("soapaction"), (void**)&tmp) == SUCCESS &&
+ Z_TYPE_PP(tmp) == IS_STRING) {
+ soap_action = Z_STRVAL_PP(tmp);
+ }

- if (zend_hash_find(ht, "uri", sizeof("uri"), (void**)&tmp) == SUCCESS &&
- Z_TYPE_PP(tmp) == IS_STRING) {
- uri = Z_STRVAL_PP(tmp);
- }
- } else if (Z_TYPE_P(options) != IS_NULL) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "first parameter must be string or null");
+ if (zend_hash_find(ht, "uri", sizeof("uri"), (void**)&tmp) == SUCCESS &&
+ Z_TYPE_PP(tmp) == IS_STRING) {
+ uri = Z_STRVAL_PP(tmp);
}
}

@@ -3259,7 +3249,7 @@
&location, &location_size,
&action, &action_size,
&version, &one_way) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}
if (SOAP_GLOBAL(features) & SOAP_WAIT_ONE_WAY_CALLS) {
one_way = 0;
@@ -3288,10 +3278,8 @@
int name_len, val_len;
zval **cookies;

- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s",
- &name, &name_len, &val, &val_len) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
- RETURN_NULL();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &name, &name_len, &val, &val_len) == FAILURE) {
+ return;
}

if (val == NULL) {
@@ -3326,8 +3314,7 @@
zval *headers = NULL;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &headers) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
- RETURN_NULL();
+ return;
}

if (headers == NULL || Z_TYPE_P(headers) == IS_NULL) {
@@ -3369,17 +3356,16 @@
int location_len;
zval **tmp;

- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s",
- &location, &location_len) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
- RETURN_NULL();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &location, &location_len) == FAILURE) {
+ return;
}
- if (zend_hash_find(Z_OBJPROP_P(this_ptr), "location", sizeof("location"),(void **) &tmp) == SUCCESS &&
- Z_TYPE_PP(tmp) == IS_STRING) {
- RETVAL_STRINGL(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);
+
+ if (zend_hash_find(Z_OBJPROP_P(this_ptr), "location", sizeof("location"),(void **) &tmp) == SUCCESS && Z_TYPE_PP(tmp) == IS_STRING) {
+ RETVAL_STRINGL(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);
} else {
RETVAL_NULL();
}
+
if (location && location_len) {
add_property_stringl(this_ptr, "location", location, location_len, 1);
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug31755.phpt?r1=1.2.4.2.2.1&r2=1.2.4.2.2.2&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug31755.phpt
diff -u php-src/ext/soap/tests/bugs/bug31755.phpt:1.2.4.2.2.1 php-src/ext/soap/tests/bugs/bug31755.phpt:1.2.4.2.2.2
--- php-src/ext/soap/tests/bugs/bug31755.phpt:1.2.4.2.2.1 Sat May 24 15:22:18 2008
+++ php-src/ext/soap/tests/bugs/bug31755.phpt Sun Sep 7 02:58:50 2008
@@ -14,4 +14,4 @@
print $client->__getLastRequest();
?>
--EXPECTF--
-Fatal error: SoapHeader::SoapHeader(): Invalid parameters. Invalid namespace. in %s on line %d
+Fatal error: SoapHeader::SoapHeader(): Invalid namespace in %s on line %d

felipe Sun Sep 7 02:58:50 2008 UTC

Modified files: (Branch: PHP_5_3)
/php-src/ext/soap soap.c
/php-src/ext/soap/tests/bugs bug31755.phpt
Log:
- MFH: Removed the doubled error message (the error level is no longer E_ERROR)

[PHP-WIN] Re: MySQL and PHP5

2008-09-06T19:54:00.000-07:00

Thanks, again, Elizabeth! Makes sense. I hadn't started the documentation
yet because I was trying to get a working understanding of things first by
going through a tutorial. I realize now that my tutorial was for an earlier
version of PHP and MySQL, so things like this are going to be a problem.

Anyway, thanks for setting me straight.

Tim R.

"Elizabeth M Smith" <auroraeosrose@gmail.com> wrote in message
news:2E.F5.12247.EE682C84@pb1.pair.com...
> Tim wrote:
>> I spoke to soon. Your tip did manage to get the MySQL section to show up
>> in
>> the output of phpinfo(), and the connect command doesn't throw an error
>> anymore, but now I get the same Undefined Function error on the line to
>> create a db:
>>
>> mysql_create_db("dbName") or die(mysql_error());
>>
>> Why would it be letting my connect command pass without an error, but
>> this
>> line generate the error?
>>
>
> Because mysql_create_db doesn't exist for mysql client libs above 4.0 -
> read the documentation at php.net please
>
> If you want to create a db, do a CREATE DATABASE query
>
> Thanks,
> Elizabeth Smith

--
PHP Windows Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/soap soap.c /ext/soap/tests/bugs bug31755.phpt

2008-09-06T19:51:00.001-07:00

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.248&r2=1.249&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.248 php-src/ext/soap/soap.c:1.249
--- php-src/ext/soap/soap.c:1.248 Mon Sep 1 14:55:42 2008
+++ php-src/ext/soap/soap.c Sun Sep 7 02:51:19 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.248 2008/09/01 14:55:42 dmitry Exp $ */
+/* $Id: soap.c,v 1.249 2008/09/07 02:51:19 felipe Exp $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1132,10 +1132,10 @@
zend_uchar name_type;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zt", &data, &name, &name_length, &name_type) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}
if (name_length == 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid parameter name");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameter name");
}

if (name_type == IS_STRING) {
@@ -1161,13 +1161,13 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "tt|zbz",
&ns, &ns_len, &ns_type, &name, &name_len, &name_type,
&data, &must_understand, &actor) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}
if (ns_len == 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid namespace");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid namespace");
}
if (name_len == 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid header name");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid header name");
}

if (ns_type == IS_STRING) {
@@ -1195,7 +1195,7 @@
} else if (Z_TYPE_P(actor) == IS_UNICODE && Z_USTRLEN_P(actor) > 0) {
add_property_unicodel(this_ptr, "actor", Z_USTRVAL_P(actor), Z_USTRLEN_P(actor), 1);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid actor");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid actor");
}
}

@@ -1218,7 +1218,7 @@
&details,
&name, &name_len, &name_type,
&headerfault) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

if (Z_TYPE_P(code) == IS_NULL) {
@@ -1236,13 +1236,13 @@
fault_code_ns = soap_encode_string(*t_ns, NULL TSRMLS_CC);
fault_code = soap_encode_string(*t_code, NULL TSRMLS_CC);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid fault code");
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid fault code");
}
if (fault_code != NULL && !fault_code[0]) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters. Invalid fault code");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid fault code");
}
if (name.v != NULL && name_len == 0) {
name.v = NULL;
@@ -1344,7 +1344,7 @@
&ns, &ns_len, &ns_type,
&name, &name_len, &name_type,
&namens, &namens_len, &namens_type) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

if (Z_TYPE_P(type) == IS_NULL) {
@@ -1525,7 +1525,10 @@
PHP_METHOD(SoapServer, SoapServer)
{
soap_server_object *service;
- zval *zwsdl, *options = NULL;
+ zval *options = NULL;
+ zstr zwsdl = NULL_ZSTR;
+ int zwsdl_len;
+ zend_uchar zwsdl_type;
char *wsdl = NULL;
int version = SOAP_1_1;
zend_bool cache_wsdl;
@@ -1533,18 +1536,16 @@

SOAP_SERVER_BEGIN_CODE();

- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|a", &zwsdl, &options) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t!|a", &zwsdl, &zwsdl_len, &zwsdl_type, &options) == FAILURE) {
+ return;
}

- if (Z_TYPE_P(zwsdl) == IS_STRING) {
- wsdl = estrndup(Z_STRVAL_P(zwsdl), Z_STRLEN_P(zwsdl));
- } else if (Z_TYPE_P(zwsdl) == IS_UNICODE) {
- wsdl = soap_unicode_to_string(Z_USTRVAL_P(zwsdl), Z_USTRLEN_P(zwsdl) TSRMLS_CC);
- } else if (Z_TYPE_P(zwsdl) == IS_NULL) {
- wsdl = NULL;
- } else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ if (zwsdl.v) {
+ if (zwsdl_type == IS_STRING) {
+ wsdl = estrndup(zwsdl.s, zwsdl_len);
+ } else {
+ wsdl = soap_unicode_to_string(zwsdl.u, zwsdl_len TSRMLS_CC);
+ }
}

service = (soap_server_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);
@@ -1755,7 +1756,7 @@
service = (soap_server_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &obj) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

service->type = SOAP_OBJECT;
@@ -1829,7 +1830,7 @@
service = (soap_server_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &function_name) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

/* TODO: could use zend_is_callable here */
@@ -1934,7 +1935,7 @@
service = (soap_server_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);
SOAP_GLOBAL(soap_version) = service->version;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|t", &arg, &arg_len, &arg_type) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

if (SG(request_info).request_method &&
@@ -2468,7 +2469,7 @@
&actor, &actor_len, &actor_type,
&details,
&name, &name_len, &name_type) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

if (code.v) {
@@ -2517,7 +2518,7 @@
}

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &fault, soap_header_class_entry) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

p = service->soap_headers_ptr;
@@ -2806,9 +2807,10 @@
SoapClient constructor */
PHP_METHOD(SoapClient, SoapClient)
{
-
- zval *zwsdl;
- char *wsdl;
+ zstr zwsdl;
+ int zwsdl_len;
+ zend_uchar zwsdl_type;
+ char *wsdl = NULL;
zval *options = NULL;
int soap_version = SOAP_1_1;
php_stream_context *context = NULL;
@@ -2820,20 +2822,16 @@

client = (soap_client_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);

- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|a", &zwsdl, &options) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t!|a", &zwsdl, &zwsdl_len, &zwsdl_type, &options) == FAILURE) {
return;
}

- if (Z_TYPE_P(zwsdl) == IS_STRING) {
- wsdl = estrndup(Z_STRVAL_P(zwsdl), Z_STRLEN_P(zwsdl));
- } else if (Z_TYPE_P(zwsdl) == IS_UNICODE) {
- wsdl = soap_unicode_to_string(Z_USTRVAL_P(zwsdl), Z_USTRLEN_P(zwsdl) TSRMLS_CC);
- } else if (Z_TYPE_P(zwsdl) != IS_NULL ) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "$wsdl must be string or null");
- return;
- } else {
- wsdl = NULL;
+ if (zwsdl.v) {
+ if (zwsdl_type == IS_STRING) {
+ wsdl = estrndup(zwsdl.s, zwsdl_len);
+ } else {
+ wsdl = soap_unicode_to_string(zwsdl.u, zwsdl_len TSRMLS_CC);
+ }
}

cache_wsdl = SOAP_GLOBAL(cache);
@@ -3375,9 +3373,9 @@
soap_client_object *client;

client = (soap_client_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ta|zzz",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ta|a!zz",
&function, &function_len, &function_type, &args, &options, &headers, &output_headers) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}

if (options) {
@@ -3412,8 +3410,6 @@
uri = soap_unicode_to_string(Z_USTRVAL_PP(tmp), Z_USTRLEN_PP(tmp) TSRMLS_CC);
}
}
- } else if (Z_TYPE_P(options) != IS_NULL) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "first parameter must be string or null");
}
}

@@ -3634,7 +3630,7 @@
&location, &location_size, &location_type,
&action, &action_size, &action_type,
&version, &one_way) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ return;
}
if (buf_type == IS_UNICODE) {
buf.s = soap_unicode_to_string(buf.u, buf_size TSRMLS_CC);
@@ -3687,8 +3683,7 @@
client = (soap_client_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|t",
&name, &name_len, &name_type, &val, &val_len, &val_type) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
- RETURN_NULL();
+ return;
}

if (val.v == NULL) {
@@ -3744,8 +3739,7 @@

client = (soap_client_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &headers) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
- RETURN_NULL();
+ return;
}

if (client->default_headers) {
@@ -3790,8 +3784,7 @@
client = (soap_client_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|t",
&location, &location_len, &location_type) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
- RETURN_NULL();
+ return;
}
if (client->location) {
RETVAL_STRING(client->location, 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug31755.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/soap/tests/bugs/bug31755.phpt
diff -u php-src/ext/soap/tests/bugs/bug31755.phpt:1.6 php-src/ext/soap/tests/bugs/bug31755.phpt:1.7
--- php-src/ext/soap/tests/bugs/bug31755.phpt:1.6 Mon May 7 17:23:03 2007
+++ php-src/ext/soap/tests/bugs/bug31755.phpt Sun Sep 7 02:51:19 2008
@@ -14,4 +14,4 @@
print $client->__getLastRequest();
?>
--EXPECTF--
-Fatal error: SoapHeader::__construct(): Invalid parameters. Invalid namespace in %s on line %d
+Fatal error: SoapHeader::__construct(): Invalid namespace in %s on line %d

felipe Sun Sep 7 02:51:19 2008 UTC

Modified files:
/php-src/ext/soap soap.c
/php-src/ext/soap/tests/bugs bug31755.phpt
Log:
- Removed the doubled error message (the error level is no longer E_ERROR)

[PHP] Re[2]: Path of the class file of an object

2008-09-06T19:35:00.001-07:00

Greetings, "Ali Çevik".
In reply to Your message dated Sunday, September 7, 2008, 1:51:33,

>>>> I need a procedure or an implementation that gives path of the class file
>>>> of
>>>> an object which I pass as a parameter.
>>>>
>>>> Example;
>>>>
>>>> Assume I have a class file located at C:\htdocs\Foo.class.php
>>>>
>>>> In code after I include Foo.class.php;
>>>>
>>>> <?php
>>>> $foo = new Foo();
>>>> Echo some_procedure($foo);
>>>> ?>
>>>>
>>>> I'm looking an implementation for that "some_procedure", which would make
>>>> this program to print C:\htdocs\Foo.class.php .
>>>> I have been googling around and also checked php.net but I wasn't able
>>>> to
>>>> find anything about this subject.
>>>>
>>>> It would be really helpful if someone knows that kind of procedure or at
>>>> least has an implementation of it.
>>>>
>>>
>>> The only way I know to do this would be to add a method to your class to
>>> give it to you.
>>>
>>> class Foo
>>> {
>>> public function getClassFilename()
>>> {
>>> return __FILE__;
>>> }
>>> }

> Hmm, that should do the trick. Thanks a lot!
> But still, I wish there were a way of doing that, without altering the
> class behaviour.

(top posting fixed)

Ok, if you prefer backward solution - hook your own error-handler and cause an
error in class, then you'll have path to it's file in backtrace.
I mean, knowing the filename of this or that function absolutely meaningless,
unless you're running into problem of some sort.

--
Sincerely Yours, ANR Daemon <anrdaemon@freemail.ru>

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP] Re: Geometrical library

2008-09-06T19:09:00.000-07:00

Hello,

on 09/03/2008 01:54 PM Yannick Warnier said the following:
> Hi there,
>
> I've been looking for a PHP library that would allow me to calculate
> superpositions of geometrical surfaces defined by polygones (defined
> themselves by points bound with lines) in 2D (surface of a polygone,
> intersections between two vectors, surface of intersection - considering
> the polygons could be complex and superpose themselves in more than one
> point).
>
> The closest to what I'm looking for, I guess, would be the PEAR
> Math_Vector package, but it is mainly based on vectors as mathematical
> arrays, whereas I would need calculations based on surfaces.
>
> Does anyone know of something that could help me?

I think this PHP class does exactly what you need:

http://www.phpclasses.org/polygon

Regards,
Manuel Lemos

Find and post PHP jobs
http://www.phpclasses.org/jobs/

PHP Classes - Free ready to use OOP components written in PHP
http://www.phpclasses.org/

--
PHP General Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2008-09-06T18:32:00.003-07:00

changelog Sun Sep 7 01:32:04 2008 UTC

Modified files:
/ZendEngine2 ChangeLog
Log:
ChangeLog update

http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1371&r2=1.1372&diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1371 ZendEngine2/ChangeLog:1.1372
--- ZendEngine2/ChangeLog:1.1371 Sat Aug 30 01:31:58 2008
+++ ZendEngine2/ChangeLog Sun Sep 7 01:32:04 2008
@@ -1,3 +1,8 @@
+2008-09-06 Arnaud Le Blanc <arnaud.lb@gmail.com>
+
+ * zend.h:
+ Ported rfc1867 hooks to HEAD
+
2008-08-29 Matt Wilmas <php_lists@realplain.com>

* (PHP_5_3)
@@ -25958,7 +25963,7 @@
2003-06-10 Jani Taskinen <sniper@iki.fi>

* zend_multiply.h:
- - Missing $Id: ChangeLog,v 1.1371 2008/08/30 01:31:58 changelog Exp $ tag
+ - Missing $Id: ChangeLog,v 1.1372 2008/09/07 01:32:04 changelog Exp $ tag

2003-06-10 James Cox <james@imajes.info>

@@ -27682,7 +27687,7 @@
zend_types.h
zend_variables.c
zend_variables.h:
- - Added some missing CVS $Id: ChangeLog,v 1.1371 2008/08/30 01:31:58 changelog Exp $ tags, headers and footers.
+ - Added some missing CVS $Id: ChangeLog,v 1.1372 2008/09/07 01:32:04 changelog Exp $ tags, headers and footers.

2003-01-30 Ilia Alshanetsky <ilia@prohost.org>

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2008-09-06T18:32:00.001-07:00

changelog Sun Sep 7 01:32:01 2008 UTC

Modified files:
/php-src ChangeLog
Log:
ChangeLog update

http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3160&r2=1.3161&diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3160 php-src/ChangeLog:1.3161
--- php-src/ChangeLog:1.3160 Fri Sep 5 01:32:08 2008
+++ php-src/ChangeLog Sun Sep 7 01:32:00 2008
@@ -1,3 +1,49 @@
+2008-09-06 Ilia Alshanetsky <ilia@prohost.org>
+
+ * ext/fileinfo/libmagic/compress.c:
+ MFB: removed unused variables
+
+ * (PHP_5_3)
+ ext/fileinfo/libmagic/compress.c:
+
+ Removed unused variables
+
+2008-09-06 Arnaud Le Blanc <arnaud.lb@gmail.com>
+
+ * (PHP_5_2)
+ NEWS
+ main/rfc1867.c
+ main/rfc1867.c:
+ MFH: Fixed #43540 (rfc1867 handler newlength problem)
+
+ * main/rfc1867.c:
+ Fixed #43540 (rfc1867 handler newlength problem)
+
+ * ZendEngine2/zend.h
+ main/rfc1867.c
+ main/rfc1867.h:
+ Ported rfc1867 hooks to HEAD
+
+ * main/rfc1867.c:
+ Fix mem leak and invalid frees in rfc1867 post handler
+
+2008-09-06 Alexey Zakhlestin <indeyets@gmail.com>
+
+ * (PHP_5_3)
+ NEWS:
+ bugfix is also applied to 5.2, so NEWS moved there
+
+ * (PHP_5_2)
+ NEWS
+ ext/snmp/snmp.c
+ ext/snmp/snmp.c:
+ MFB: Fixed bug #45405 (snmp extension memory leak)
+
+ * (PHP_5_3)
+ NEWS
+ ext/snmp/snmp.c:
+ Fixed bug #45405 (snmp extension memory leak)
+
2008-09-04 Stanislav Malyshev <stas@zend.com>

* (PHP_5_3)
@@ -4900,7 +4946,7 @@

* sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c:
- - Added missing $Id: ChangeLog,v 1.3160 2008/09/05 01:32:08 changelog Exp $ tags and nuked c++ comments
+ - Added missing $Id: ChangeLog,v 1.3161 2008/09/07 01:32:00 changelog Exp $ tags and nuked c++ comments

* (PHP_5_3)
ext/intl/locale/locale.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session/tests 020.phpt

2008-09-06T17:42:00.003-07:00

kalle Sun Sep 7 00:42:40 2008 UTC

Modified files: (Branch: PHP_5_3)
/php-src/ext/session/tests 020.phpt
Log:
MFH: Fix test on Windows

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/020.phpt?r1=1.4.4.1&r2=1.4.4.1.2.1&diff_format=u
Index: php-src/ext/session/tests/020.phpt
diff -u php-src/ext/session/tests/020.phpt:1.4.4.1 php-src/ext/session/tests/020.phpt:1.4.4.1.2.1
--- php-src/ext/session/tests/020.phpt:1.4.4.1 Thu Aug 23 11:39:45 2007
+++ php-src/ext/session/tests/020.phpt Sun Sep 7 00:42:40 2008
@@ -6,7 +6,7 @@
session.use_cookies=0
session.cache_limiter=
session.use_trans_sid=1
-arg_separator.output="&"
+arg_separator.output=&
session.name=PHPSESSID
session.serialize_handler=php
session.save_handler=files

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

2008-09-06T17:42:00.001-07:00

kalle Sun Sep 7 00:42:29 2008 UTC

Modified files:
/php-src/ext/session/tests 020.phpt
Log:
Fix test on Windows

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/020.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/session/tests/020.phpt
diff -u php-src/ext/session/tests/020.phpt:1.5 php-src/ext/session/tests/020.phpt:1.6
--- php-src/ext/session/tests/020.phpt:1.5 Mon Feb 13 10:23:57 2006
+++ php-src/ext/session/tests/020.phpt Sun Sep 7 00:42:29 2008
@@ -6,7 +6,7 @@
session.use_cookies=0
session.cache_limiter=
session.use_trans_sid=1
-arg_separator.output="&"
+arg_separator.output=&
session.name=PHPSESSID
session.serialize_handler=php
session.save_handler=files

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] Strange problem with php_stream_read()

2008-09-06T17:41:00.000-07:00

buff needs to be null terminated, you can use RETURN_STRINGL(buff,
content_size, 1); if you know the length.

Scott
On 6 Sep 2008, at 23:19, Mangol Smith wrote:

> Hello all,
>
> I got a strange problem. I opened a network stream with my web server
> (localhost:80) and wrote a HTTP GET into stream and reading the HTTP
> RESPONSE.
>
> buff = (char *)emalloc(content_size);
> php_stream_read(http_stream, buff, content_size);
>
> where content_size is the Content-Length value in Response header.
> Problem
> is that when I return RETURN_STRING(buff,1); to userland. I'm
> getting a
> string with the content (response body) + some crap.
>
> length of string is more than content_size.
>
> for example: in a case content_size was 29; after php_stream_read()
> line,
> the strlen(buff) is returning 41. How is this possible?
>
> somewhere I read this
>
> php_stream_read() differs from other stream read functions in one
> surprising
> way. If the stream in use is not a plain files stream, only one call
> to the
> underlying stream implementation's read function will be made, even
> if more
> data was requested and more is actually available to return. This is a
> compromise to let packet-based protocols such as UDP function cleanly
> without blocking.
>
> I didn't clearly understand its meaning. Does it has anything to do
> with my
> results? Any help in understanding this behavious of
> php_stream_read() ?
>
>
>
> --
> Mangol Smith

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

PHP world News

Re: [PHP] php image and javascript include

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mcrypt mcrypt.c /ext/mcrypt/tests bug46010.phpt mcrypt_ecb.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mcrypt mcrypt.c /ext/mcrypt/tests bug46010.phpt

[PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c /ext/mcrypt/tests bug46010.phpt

Re: [PHP-DB] If( Query)

Re: [PHP-DB] If( Query)

Re: [PHP-DB] mysql auto_increment

Re: [PHP-DB] mysql auto_increment

Re: [PHP-DB] mysql auto_increment

Re: [PHP] Re[2]: Path of the class file of an object

Re: [PHP] php image and javascript include

[PHP-DB] mysql auto_increment

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

Re: [PHP] php image and javascript include

[DOC-CVS] cvs: phpdoc /da preface.xml translation.xml

[PHP-CVS] cvs: php-src /ext/fileinfo fileinfo.c /ext/fileinfo/libmagic apprentice.c compress.c file.h fsmagic.c funcs.c magic.c magic.h /ext/fileinfo/tests finfo_file_001.phpt mime_content_type_001.phpt

[PHP-DEV] make fails due to ext/iconv/php_have_ibm_iconv.h missing (5.3 including alpha2)

Re: [PHP-DEV] namespace RFC

[DOC-CVS] cvs: phpdoc /en/language control-structures.xml

Re: [PHP] php image and javascript include

Re: [PHP] php image and javascript include

Re: [PHP-DB] If( Query)

Re: [PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

Re: [PHP] php image and javascript include

Re: [PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

[PHP-CVS] cvs: php-src /ext/session/tests 020.phpt bug41600.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session/tests 020.phpt bug41600.phpt

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

Re: [PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

Re: [PHP] php image and javascript include

Re: [PHP] Recursive Iteration over a collection of objects

Re: [PHP] php image and javascript include

[PHP-CVS] cvs: CVSROOT / avail

[PHP-QA] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

Re: [PHP] php image and javascript include

Re: [PHP] Recursive Iteration over a collection of objects

Re: [PHP] Length of Exception text?

Prathan, theres something BIG on the horizon...

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c

[PHP-CVS] cvs: php-src(PHP_5_3) /main rfc1867.c

[PHP-CVS] cvs: php-src /main rfc1867.c

[PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

[PHP-DEV] Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

[PHP-DEV] Could somebody with ZE2 karma please commit this? (was: [RFC] [PATCH] Rounding in PHP)

Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

Re: [PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

Re: [PHP-DOC] SQL Injection link

[PHP-DEV] Critical bugs to fix before ANY release

[PHP-DOC] Notes Status, 21043 total

Re: [PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

[PHP-DOC] SQL Injection link

[PHP-DEV] Regression on constructor calls

[PHP-INSTALL] PHP installing on LINUX

[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic compress.c

Re: [PHP] Re: Geometrical library

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap soap.c /ext/soap/tests/bugs bug31755.phpt

[PHP-WIN] Re: MySQL and PHP5

[PHP-CVS] cvs: php-src /ext/soap soap.c /ext/soap/tests/bugs bug31755.phpt

[PHP] Re[2]: Path of the class file of an object

[PHP] Re: Geometrical library

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session/tests 020.phpt

[PHP-CVS] cvs: php-src /ext/session/tests 020.phpt

Re: [PHP-DEV] Strange problem with php_stream_read()

Prathan, theres something BIG on the horizon...