iliaa Mon Dec 6 18:31:07 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard file.c
/php-src NEWS
Log:
MFH: Fixed bug #30990 (allow popen() on *NIX to accept 'b' flag).
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.382.2.2&r2=1.382.2.3&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.382.2.2
php-src/ext/standard/file.c:1.382.2.3
--- php-src/ext/standard/file.c:1.382.2.2 Thu Oct 28 20:37:51 2004
+++ php-src/ext/standard/file.c Mon Dec 6 18:31:07 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.382.2.2 2004/10/29 00:37:51 andi Exp $ */
+/* $Id: file.c,v 1.382.2.3 2004/12/06 23:31:07 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -812,6 +812,14 @@
convert_to_string_ex(arg1);
convert_to_string_ex(arg2);
p = estrndup(Z_STRVAL_PP(arg2), Z_STRLEN_PP(arg2));
+#ifndef PHP_WIN32
+ {
+ char *z = memchr(p, 'b', Z_STRLEN_PP(arg2));
+ if (z) {
+ memmove(p + (z - p), z + 1, Z_STRLEN_PP(arg2) - (z -
p));
+ }
+ }
+#endif
if (PG(safe_mode)){
b = strchr(Z_STRVAL_PP(arg1), ' ');
if (!b) {
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.143&r2=1.1760.2.144&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.143 php-src/NEWS:1.1760.2.144
--- php-src/NEWS:1.1760.2.143 Mon Dec 6 14:45:56 2004
+++ php-src/NEWS Mon Dec 6 18:31:07 2004
@@ -7,6 +7,7 @@
- Extended the functionality of is_subclass_of() to accept either a class name
or an object as first parameter. (Andrey)
- Fixed potential problems with unserializing invalid serialize data. (Marcus)
+- Fixed bug #30990 (allow popen() on *NIX to accept 'b' flag). (Ilia)
- Fixed bug #30967 (properties in extended mysqli classes don't work). (Georg)
- Fixed bug #30922 (reflective functions crash PHP when interfaces extend
themselves). (Tony, Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
