[PHP-CVS] cvs: php-src /ext/standard dir.c
iliaa Tue May 11 09:34:19 2004 EDT
Modified files:
/php-src/ext/standard dir.c
Log:
Fixed bug #28355 (glob() does not return error on Linux when it does not
have permission to open the directory).
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.137r2=1.138ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.137 php-src/ext/standard/dir.c:1.138
--- php-src/ext/standard/dir.c:1.137Sun May 9 15:01:13 2004
+++ php-src/ext/standard/dir.c Tue May 11 09:34:19 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.137 2004/05/09 19:01:13 iliaa Exp $ */
+/* $Id: dir.c,v 1.138 2004/05/11 13:34:19 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -400,8 +400,12 @@
* doesn't. This ensure that if no match is found, an empty
array
* is always returned so it can be used without worrying in
e.g.
* foreach() */
+#if __linux__
+ RETURN_FALSE;
+#else
array_init(return_value);
return;
+#endif
}
#endif
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard dir.c
iliaa Tue May 11 09:34:31 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard dir.c
Log:
MFH: Fixed bug #28355 (glob() does not return error on Linux when it does
not have permission to open the directory).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.658r2=1.1247.2.659ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.658 php-src/NEWS:1.1247.2.659
--- php-src/NEWS:1.1247.2.658 Mon May 10 18:13:38 2004
+++ php-src/NEWSTue May 11 09:34:30 2004
@@ -10,6 +10,8 @@
with multiple result sets returned. (Frank)
- Fixed logic bug in session_register() which allowed registering _SESSION
and/or HTTP_SESSION_VARS. (Sara)
+- Fixed bug #28355 (glob() does not return error on Linux when it does not
+ have permission to open the directory). (Ilia)
- Fixed bug #28289 (incorrect resolving of relative paths by glob() in
windows). (Ilia)
- Fixed bug #28229 (run-tests tripped up by spaces in names). (Marcus)
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.109.2.15r2=1.109.2.16ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.15 php-src/ext/standard/dir.c:1.109.2.16
--- php-src/ext/standard/dir.c:1.109.2.15 Sun May 9 15:01:27 2004
+++ php-src/ext/standard/dir.c Tue May 11 09:34:31 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.109.2.15 2004/05/09 19:01:27 iliaa Exp $ */
+/* $Id: dir.c,v 1.109.2.16 2004/05/11 13:34:31 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -391,8 +391,12 @@
* doesn't. This ensure that if no match is found, an empty
array
* is always returned so it can be used without worrying in
e.g.
* foreach() */
+#if __linux__
+ RETURN_FALSE;
+#else
array_init(return_value);
return;
+#endif
}
#endif
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main rfc1867.c
derick Tue May 11 11:30:54 2004 EDT
Modified files:
/php-src/main rfc1867.c
Log:
- Fixed defines
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.154r2=1.155ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.154 php-src/main/rfc1867.c:1.155
--- php-src/main/rfc1867.c:1.154Thu Mar 25 16:27:23 2004
+++ php-src/main/rfc1867.c Tue May 11 11:30:54 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.154 2004/03/25 21:27:23 derick Exp $ */
+/* $Id: rfc1867.c,v 1.155 2004/05/11 15:30:54 derick Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -948,7 +948,7 @@
cancel_upload = 0;
if(strlen(filename) == 0) {
-#ifdef DEBUG_FILE_UPLOAD
+#if DEBUG_FILE_UPLOAD
sapi_module.sapi_error(E_NOTICE, No file uploaded);
#endif
cancel_upload = UPLOAD_ERROR_D;
@@ -957,12 +957,12 @@
while (!cancel_upload (blen = multipart_buffer_read(mbuff,
buff, sizeof(buff) TSRMLS_CC)))
{
if (PG(upload_max_filesize) 0 total_bytes
PG(upload_max_filesize)) {
-#ifdef DEBUG_FILE_UPLOAD
+#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);
#endif
cancel_upload = UPLOAD_ERROR_A;
} else if (max_file_size (total_bytes
max_file_size)) {
-#ifdef DEBUG_FILE_UPLOAD
+#if DEBUG_FILE_UPLOAD
sapi_module.sapi_error(E_NOTICE,
MAX_FILE_SIZE of %ld bytes exceeded - file [%s=%s] not saved, max_file_size, param,
filename);
#endif
cancel_upload = UPLOAD_ERROR_B;
@@ -970,7 +970,7 @@
wlen = fwrite(buff, 1, blen, fp);
if (wlen blen) {
-#ifdef DEBUG_FILE_UPLOAD
+#if DEBUG_FILE_UPLOAD
sapi_module.sapi_error(E_NOTICE, Only
%d bytes were written, expected to write %ld, wlen, blen);
#endif
cancel_upload = UPLOAD_ERROR_C;
@@ -981,7 +981,7 @@
}
fclose(fp);
-#ifdef DEBUG_FILE_UPLOAD
+#if DEBUG_FILE_UPLOAD
if(strlen(filename) 0 total_bytes == 0) {
sapi_module.sapi_error(E_WARNING, Uploaded file size
0 - file [%s=%s] not saved, param, filename);
cancel_upload = 5;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy tidy.c
iliaa Tue May 11 11:59:07 2004 EDT
Modified files:
/php-src/ext/tidy tidy.c
Log:
Reset opt_name to NULL to ensure it's not re-used if numeric keys can be
found inside the options array.
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.50r2=1.51ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.50 php-src/ext/tidy/tidy.c:1.51
--- php-src/ext/tidy/tidy.c:1.50Sun May 9 10:00:14 2004
+++ php-src/ext/tidy/tidy.c Tue May 11 11:59:07 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.50 2004/05/09 14:00:14 john Exp $ */
+/* $Id: tidy.c,v 1.51 2004/05/11 15:59:07 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -841,6 +841,7 @@
if(opt_name) {
_php_tidy_set_tidy_opt(doc, opt_name, *opt_val TSRMLS_CC);
+ opt_name = NULL;
}
}
@@ -930,7 +931,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Tidy support, enabled);
php_info_print_table_row(2, libTidy Release, (char *)tidyReleaseDate());
- php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION
($Id: tidy.c,v 1.50 2004/05/09 14:00:14 john Exp $));
+ php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION
($Id: tidy.c,v 1.51 2004/05/11 15:59:07 iliaa Exp $));
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard formatted_print.c
iliaa Tue May 11 15:51:46 2004 EDT
Modified files:
/php-src/ext/standard formatted_print.c
Log:
Make vprintf() and printf() return the length of the string printed.
Make fprintf() and vfprints() return the correct length of the string
printed.
http://cvs.php.net/diff.php/php-src/ext/standard/formatted_print.c?r1=1.74r2=1.75ty=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.74
php-src/ext/standard/formatted_print.c:1.75
--- php-src/ext/standard/formatted_print.c:1.74 Mon Feb 16 12:09:37 2004
+++ php-src/ext/standard/formatted_print.c Tue May 11 15:51:46 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: formatted_print.c,v 1.74 2004/02/16 17:09:37 iliaa Exp $ */
+/* $Id: formatted_print.c,v 1.75 2004/05/11 19:51:46 iliaa Exp $ */
#include math.h /* modf() */
#include php.h
@@ -781,6 +781,7 @@
}
PHPWRITE(result, len);
efree(result);
+ RETURN_LONG(len);
}
/* }}} */
@@ -796,6 +797,7 @@
}
PHPWRITE(result, len);
efree(result);
+ RETURN_LONG(len);
}
/* }}} */
@@ -826,7 +828,7 @@
efree(result);
- RETVAL_LONG(len - 1);
+ RETURN_LONG(len);
}
/* {{{ proto int vfprintf(resource stream, string format, array args)
@@ -856,7 +858,7 @@
efree(result);
- RETVAL_LONG(len - 1);
+ RETURN_LONG(len);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard formatted_print.c
iliaa Tue May 11 15:51:50 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard formatted_print.c Log: MFH: Make vprintf() and printf() return the length of the string printed. http://cvs.php.net/diff.php/php-src/ext/standard/formatted_print.c?r1=1.59.2.8r2=1.59.2.9ty=u Index: php-src/ext/standard/formatted_print.c diff -u php-src/ext/standard/formatted_print.c:1.59.2.8 php-src/ext/standard/formatted_print.c:1.59.2.9 --- php-src/ext/standard/formatted_print.c:1.59.2.8 Mon Feb 16 12:09:52 2004 +++ php-src/ext/standard/formatted_print.c Tue May 11 15:51:50 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: formatted_print.c,v 1.59.2.8 2004/02/16 17:09:52 iliaa Exp $ */ +/* $Id: formatted_print.c,v 1.59.2.9 2004/05/11 19:51:50 iliaa Exp $ */ #include math.h /* modf() */ #include php.h @@ -758,6 +758,7 @@ } PHPWRITE(result, len); efree(result); + RETURN_LONG(len); } /* }}} */ @@ -773,6 +774,7 @@ } PHPWRITE(result, len); efree(result); + RETURN_LONG(len); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
