john Wed Nov 13 08:31:33 2002 EDT
Modified files:
/php4 run-tests2.php
/php4/ext/standard array.c dir.c
Log:
Added GLOB_ONLYDIR and GLOB_BRACE for compatiable systems for the glob()
function.
Modified the layout and some minor logic in the experimental webHarness()
test class
Added Whitespace accidently to array.c :)
Index: php4/run-tests2.php
diff -u php4/run-tests2.php:1.2 php4/run-tests2.php:1.3
--- php4/run-tests2.php:1.2 Thu Oct 31 19:22:02 2002
+++ php4/run-tests2.php Wed Nov 13 08:31:32 2002
@@ -18,7 +18,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
| Derick Rethans <[EMAIL PROTECTED]> |
| Sander Roobol <[EMAIL PROTECTED]> |
- | John Coggeshall <[EMAIL PROTECTED] |
+ | John Coggeshall <[EMAIL PROTECTED]> |
| (based on version by: Stig Bakken <[EMAIL PROTECTED]>) |
| (based on the PHP 3 test framework by Rasmus Lerdorf) |
+----------------------------------------------------------------------+
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.198 php4/ext/standard/array.c:1.199
--- php4/ext/standard/array.c:1.198 Tue Nov 5 11:19:19 2002
+++ php4/ext/standard/array.c Wed Nov 13 08:31:32 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.198 2002/11/05 16:19:19 iliaa Exp $ */
+/* $Id: array.c,v 1.199 2002/11/13 13:31:32 john Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -3250,7 +3250,7 @@
}
if (Z_TYPE_PP(input) != IS_ARRAY) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument
shouldbe an array");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument should
+be an array");
return;
}
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.108 php4/ext/standard/dir.c:1.109
--- php4/ext/standard/dir.c:1.108 Mon Oct 7 12:46:38 2002
+++ php4/ext/standard/dir.c Wed Nov 13 08:31:33 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.108 2002/10/07 16:46:38 rasmus Exp $ */
+/* $Id: dir.c,v 1.109 2002/11/13 13:31:33 john Exp $ */
/* {{{ includes/startup/misc */
@@ -133,6 +133,12 @@
REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr,
CONST_CS|CONST_PERSISTENT);
#ifdef HAVE_GLOB
+#ifdef GLOB_BRACE
+ REGISTER_LONG_CONSTANT("GLOB_BRACE", GLOB_BRACE, CONST_CS | CONST_PERSISTENT);
+#endif
+#ifdef GLOB_ONLYDIR
+ REGISTER_LONG_CONSTANT("GLOB_ONLYDIR", GLOB_ONLYDIR, CONST_CS |
+CONST_PERSISTENT);
+#endif
#ifdef GLOB_MARK
REGISTER_LONG_CONSTANT("GLOB_MARK", GLOB_MARK, CONST_CS | CONST_PERSISTENT);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
