[PHP-CVS] cvs: php-src /ext/dom/tests DOMComment_construct_basic_001.phpt DOMDocumentFragment_appendXML_error_002.phpt DOMDocumentFragment_appendXML_error_003.phpt DOMDocumentFragment_construct_basic_

2009-05-25 Thread Eric Stewart 
ericstewart Tue May 26 06:11:26 2009 UTC

  Modified files:  
/php-src/ext/dom/tests  DOMComment_construct_basic_001.phpt 
DOMDocumentFragment_appendXML_error_002.phpt 
DOMDocumentFragment_appendXML_error_003.phpt 
DOMDocumentFragment_construct_basic_002.phpt 
DOMDocumentType_basic_001.phpt 
DOMDocumentType_entities_error_001.phpt 
DOMDocumentType_internalSubset_error_001.phpt 
DOMDocumentType_name_error_001.phpt 
DOMDocumentType_notations_error_001.phpt 
DOMDocumentType_publicId_basic_001.phpt 
DOMDocumentType_publicId_error_001.phpt 
DOMDocumentType_systemId_basic_001.phpt 
DOMDocumentType_systemId_error_001.phpt 
  Log:
  Add tests:
  DOMComment::__construct() with constructor called twice.
  DOMDocumentFragment::appendXML() with unbound fragment.
  DOMDocumentFragment::appendXML() with unbalanced chunks.
  DOMDocumentFragment::__construct() called twice.
  DOMDocumentType: basic access to all properties.
  DOMDocumentType::name with invalid state.
  DOMDocumentType::entities with invalid state.
  DOMDocumentType::notations with invalid state.
  DOMDocumentType::publicId with invalid state.
  DOMDocumentType::publicId with empty value.
  DOMDocumentType::systemId with invalid state.
  DOMDocumentType::systemId with empty value.
  DOMDocumentType::internalSubset with invalid state.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt
diff -u /dev/null php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt:1.2
--- /dev/null   Tue May 26 06:11:26 2009
+++ php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt   Tue May 26 
06:11:26 2009
@@ -0,0 +1,19 @@
+--TEST--
+DOMComment::__construct() with constructor called twice.
+--CREDITS--
+Eric Lee Stewart 
+# TestFest Atlanta 2009-05-25
+--SKIPIF--
+
+--FILE--
+appendChild(new DOMElement('root'));
+$comment = new DOMComment("This is the first comment.");
+$comment->__construct("This is the second comment.");
+$comment = $element->appendChild($comment);
+print $dom->saveXML();
+?>
+--EXPECT--
+
+
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
diff -u /dev/null 
php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt:1.2
--- /dev/null   Tue May 26 06:11:26 2009
+++ php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt  Tue May 
26 06:11:26 2009
@@ -0,0 +1,19 @@
+--TEST--
+DOMDocumentFragment::appendXML() with unbound fragment.
+--CREDITS--
+Eric Lee Stewart 
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+
+--FILE--
+appendXML('crankbait');
+$document->appendChild($fragment);
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'DOMException' with message 'No Modification 
Allowed Error' in %s:%d
+Stack trace:
+#0 %s(%d): DOMDocumentFragment->appendXML('crankbait...')
+#1 {main}
+  thrown in %s on line %d
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
diff -u /dev/null 
php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt:1.2
--- /dev/null   Tue May 26 06:11:26 2009
+++ php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt  Tue May 
26 06:11:26 2009
@@ -0,0 +1,19 @@
+--TEST--
+DOMDocumentFragment::appendXML() with unbalanced chunks.
+--CREDITS--
+Eric Lee Stewart 
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+
+--FILE--
+createElement('root');
+$document->appendChild($root);
+
+$fragment = $document->createDocumentFragment();
+...@$fragment->appendXML('isgreat');
+$root->appendChild($fragment);
+?>
+--EXPECTF--
+Warning: DOMNode::appendChild(): Document Fragment is empty in %s on line %d
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt
diff -u /dev/null 
php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt:1.2
--- /dev/null   Tue May 26 06:11:26 2009
+++ php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt  Tue May 
26 06:11:26 2009
@@ -0,0 +1,16 @@
+--TEST--
+DOMDocumentFragment::__construct() called twice.
+--CREDITS--
+Eric Lee Stewart 
+# TestFest Atlanta 2009-05-24
+--SKIPIF--
+
+--FILE--
+__construct();
+var_dump($fragment);
+?>
+--EXPECTF--
+o

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom/tests DOMComment_construct_basic_001.phpt DOMDocumentFragment_appendXML_error_002.phpt DOMDocumentFragment_appendXML_error_003.phpt DOMDocumentFragment_constru

2009-05-25 Thread Eric Stewart 
ericstewart Tue May 26 06:09:18 2009 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/dom/tests  DOMComment_construct_basic_001.phpt 
DOMDocumentFragment_appendXML_error_002.phpt 
DOMDocumentFragment_appendXML_error_003.phpt 
DOMDocumentFragment_construct_basic_002.phpt 
DOMDocumentType_basic_001.phpt 
DOMDocumentType_entities_error_001.phpt 
DOMDocumentType_internalSubset_error_001.phpt 
DOMDocumentType_name_error_001.phpt 
DOMDocumentType_notations_error_001.phpt 
DOMDocumentType_publicId_basic_001.phpt 
DOMDocumentType_publicId_error_001.phpt 
DOMDocumentType_systemId_basic_001.phpt 
DOMDocumentType_systemId_error_001.phpt 
  Log:
  Add tests:
  DOMComment::__construct() with constructor called twice.
  DOMDocumentFragment::appendXML() with unbound fragment.
  DOMDocumentFragment::appendXML() with unbalanced chunks.
  DOMDocumentFragment::__construct() called twice.
  DOMDocumentType: basic access to all properties.
  DOMDocumentType::name with invalid state.
  DOMDocumentType::entities with invalid state.
  DOMDocumentType::notations with invalid state.
  DOMDocumentType::publicId with invalid state.
  DOMDocumentType::publicId with empty value.
  DOMDocumentType::systemId with invalid state.
  DOMDocumentType::systemId with empty value.
  DOMDocumentType::internalSubset with invalid state.
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt
+++ php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
+++ php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
+++ php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt
+++ php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_basic_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_basic_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_basic_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_entities_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_entities_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_name_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_name_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_name_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_notations_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_notations_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt



-- 
PHP CVS M

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom/tests DOMComment_construct_basic_001.phpt DOMDocumentFragment_appendXML_error_002.phpt DOMDocumentFragment_appendXML_error_003.phpt DOMDocumentFragment_constru

2009-05-25 Thread Eric Stewart 
ericstewart Tue May 26 06:06:39 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/dom/tests  DOMComment_construct_basic_001.phpt 
DOMDocumentFragment_appendXML_error_002.phpt 
DOMDocumentFragment_appendXML_error_003.phpt 
DOMDocumentFragment_construct_basic_002.phpt 
DOMDocumentType_basic_001.phpt 
DOMDocumentType_entities_error_001.phpt 
DOMDocumentType_internalSubset_error_001.phpt 
DOMDocumentType_name_error_001.phpt 
DOMDocumentType_notations_error_001.phpt 
DOMDocumentType_publicId_basic_001.phpt 
DOMDocumentType_publicId_error_001.phpt 
DOMDocumentType_systemId_basic_001.phpt 
DOMDocumentType_systemId_error_001.phpt 
  Log:
  Add tests:
  DOMComment::__construct() with constructor called twice.
  DOMDocumentFragment::appendXML() with unbound fragment.
  DOMDocumentFragment::appendXML() with unbalanced chunks.
  DOMDocumentFragment::__construct() called twice.
  DOMDocumentType: basic access to all properties.
  DOMDocumentType::name with invalid state.
  DOMDocumentType::entities with invalid state.
  DOMDocumentType::notations with invalid state.
  DOMDocumentType::publicId with invalid state.
  DOMDocumentType::publicId with empty value.
  DOMDocumentType::systemId with invalid state.
  DOMDocumentType::systemId with empty value.
  DOMDocumentType::internalSubset with invalid state.
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt
+++ php-src/ext/dom/tests/DOMComment_construct_basic_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
+++ php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt
+++ php-src/ext/dom/tests/DOMDocumentFragment_appendXML_error_003.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt
+++ php-src/ext/dom/tests/DOMDocumentFragment_construct_basic_002.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_basic_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_basic_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_basic_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_entities_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_entities_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_entities_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_internalSubset_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_name_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_name_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_name_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_notations_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_notations_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_notations_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_publicId_basic_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_publicId_error_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_systemId_basic_001.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt
+++ php-src/ext/dom/tests/DOMDocumentType_systemId_error_001.phpt



-- 
PHP CVS M

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

2009-05-25 Thread Jani Taskinen 
janiTue May 26 05:57:40 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/zlib   zlib.c 
  Log:
  MF53: - Fixed bug #45202 (zlib.output_compression can not be set with 
ini_set()
  # This is fixed in HEAD already. :)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1520&r2=1.2027.2.547.2.1521&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1520 php-src/NEWS:1.2027.2.547.2.1521
--- php-src/NEWS:1.2027.2.547.2.1520Tue May 26 04:47:04 2009
+++ php-src/NEWSTue May 26 05:57:40 2009
@@ -113,6 +113,8 @@
 - Fixed bug #45614 (ArrayIterator::current(), ::key() can show 1st private
   prop of wrapped object). (robin_fernandes at uk dot ibm dot com, Arnaud)
 - Fixed bug #45540 (stream_context_create creates bad http request). (Arnaud)
+- Fixed bug #45202 (zlib.output_compression can not be set with ini_set()).
+  (Jani)
 - Fixed bug #45191 (error_log ignores date.timezone php.ini val when
   setting logging timestamps). (Derick)
 - Fixed bug #45092 (header HTTP context option not being used when compiled
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.11&r2=1.183.2.6.2.12&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.11 
php-src/ext/zlib/zlib.c:1.183.2.6.2.12
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.11  Tue May 26 04:47:05 2009
+++ php-src/ext/zlib/zlib.c Tue May 26 05:57:40 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.11 2009/05/26 04:47:05 jani Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.12 2009/05/26 05:57:40 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -88,7 +88,7 @@
 /* True globals, no need for thread safety */
 static const int gz_magic[2] = {0x1f, 0x8b};   /* gzip magic header */
 
-static int php_enable_output_compression(int buffer_size TSRMLS_DC);
+static int php_zlib_output_compression_start(TSRMLS_D);
 
 static PHP_MINIT_FUNCTION(zlib);
 static PHP_MSHUTDOWN_FUNCTION(zlib);
@@ -176,6 +176,7 @@
 /* {{{ OnUpdate_zlib_output_compression */
 static PHP_INI_MH(OnUpdate_zlib_output_compression)
 {
+   int status, int_value;
char *ini_value;
 
if (new_value == NULL) {
@@ -190,8 +191,10 @@
new_value_length = sizeof("1");
}
 
+   int_value = zend_atoi(new_value, new_value_length);
ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 
0);
-   if (ini_value != NULL && strlen(ini_value) != 0 && zend_atoi(new_value, 
new_value_length) != 0) {
+
+   if (ini_value && *ini_value && int_value) {
php_error_docref("ref.outcontrol" TSRMLS_CC, E_CORE_ERROR, 
"Cannot use both zlib.output_compression and output_handler together!!");
return FAILURE;
}
@@ -201,9 +204,13 @@
return FAILURE;
}
 
-   OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, 
mh_arg3, stage TSRMLS_CC);
+   status = OnUpdateLong(entry, new_value, new_value_length, mh_arg1, 
mh_arg2, mh_arg3, stage TSRMLS_CC);
 
-   return SUCCESS;
+   if (stage == PHP_INI_STAGE_RUNTIME && int_value) {
+   status = php_zlib_output_compression_start(TSRMLS_C);
+   }
+
+   return status;
 }
 /* }}} */
 
@@ -257,18 +264,10 @@
  */
 static PHP_RINIT_FUNCTION(zlib)
 {
-   uint chunk_size = ZLIBG(output_compression);
-
ZLIBG(ob_gzhandler_status) = 0;
ZLIBG(compression_coding) = 0;
-   if (chunk_size) {
-   if (chunk_size == 1) {
-   chunk_size = 4096; /* use the default size */
-   ZLIBG(output_compression) = chunk_size;
-   }
-   php_enable_output_compression(chunk_size TSRMLS_CC);
-   }
-   return SUCCESS;
+
+   return php_zlib_output_compression_start(TSRMLS_C);
 }
 /* }}} */
 
@@ -1032,6 +1031,24 @@
 }
 /* }}} */
 
+/* {{{ php_zlib_output_compression_start() */
+static int php_zlib_output_compression_start(TSRMLS_D)
+{
+   switch (ZLIBG(output_compression)) {
+   case 0:
+   break;
+   case 1:
+   ZLIBG(output_compression) = 4096;
+   default:
+   /* ZLIBG(compression_coding) should be 0 when zlib 
compression hasn't been started yet.. */
+   if (ZLIBG(compression_coding) == 0) {
+   return 
php_enable_output_compression(ZLIBG(output_compression) TSRMLS_CC);
+   }
+   }
+   return SUCCESS;
+}
+/* }}} */
+
 /*
  * Local variables:
  * tab-width: 4



-- 
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/zlib zlib.c

2009-05-25 Thread Jani Taskinen 
janiTue May 26 05:54:50 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/zlib   zlib.c 
  Log:
  - Fixed bug #45202 (zlib.output_compression can not be set with ini_set())
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.5.2.11&r2=1.183.2.6.2.5.2.12&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.11 
php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.12
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.11  Tue May 26 04:44:54 2009
+++ php-src/ext/zlib/zlib.c Tue May 26 05:54:50 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.5.2.11 2009/05/26 04:44:54 jani Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.5.2.12 2009/05/26 05:54:50 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -88,7 +88,7 @@
 /* True globals, no need for thread safety */
 static const int gz_magic[2] = {0x1f, 0x8b};   /* gzip magic header */
 
-static int php_enable_output_compression(int buffer_size TSRMLS_DC);
+static int php_zlib_output_compression_start(TSRMLS_D);
 
 static PHP_MINIT_FUNCTION(zlib);
 static PHP_MSHUTDOWN_FUNCTION(zlib);
@@ -228,6 +228,7 @@
 /* {{{ OnUpdate_zlib_output_compression */
 static PHP_INI_MH(OnUpdate_zlib_output_compression)
 {
+   int status, int_value;
char *ini_value;
 
if (new_value == NULL) {
@@ -242,8 +243,10 @@
new_value_length = sizeof("1");
}
 
+   int_value = zend_atoi(new_value, new_value_length);
ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 
0);
-   if (ini_value != NULL && strlen(ini_value) != 0 && zend_atoi(new_value, 
new_value_length) != 0) {
+
+   if (ini_value && *ini_value && int_value) {
php_error_docref("ref.outcontrol" TSRMLS_CC, E_CORE_ERROR, 
"Cannot use both zlib.output_compression and output_handler together!!");
return FAILURE;
}
@@ -253,9 +256,13 @@
return FAILURE;
}
 
-   OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, 
mh_arg3, stage TSRMLS_CC);
+   status = OnUpdateLong(entry, new_value, new_value_length, mh_arg1, 
mh_arg2, mh_arg3, stage TSRMLS_CC);
 
-   return SUCCESS;
+   if (stage == PHP_INI_STAGE_RUNTIME && int_value) {
+   status = php_zlib_output_compression_start(TSRMLS_C);
+   }
+
+   return status;
 }
 /* }}} */
 
@@ -309,18 +316,10 @@
  */
 static PHP_RINIT_FUNCTION(zlib)
 {
-   uint chunk_size = ZLIBG(output_compression);
-
ZLIBG(ob_gzhandler_status) = 0;
ZLIBG(compression_coding) = 0;
-   if (chunk_size) {
-   if (chunk_size == 1) {
-   chunk_size = 4096; /* use the default size */
-   ZLIBG(output_compression) = chunk_size;
-   }
-   php_enable_output_compression(chunk_size TSRMLS_CC);
-   }
-   return SUCCESS;
+
+   return php_zlib_output_compression_start(TSRMLS_C);
 }
 /* }}} */
 
@@ -1084,6 +1083,24 @@
 }
 /* }}} */
 
+/* {{{ php_zlib_output_compression_start() */
+static int php_zlib_output_compression_start(TSRMLS_D)
+{
+   switch (ZLIBG(output_compression)) {
+   case 0:
+   break;
+   case 1:
+   ZLIBG(output_compression) = 4096;
+   default:
+   /* ZLIBG(compression_coding) should be 0 when zlib 
compression hasn't been started yet.. */
+   if (ZLIBG(compression_coding) == 0) {
+   return 
php_enable_output_compression(ZLIBG(output_compression) TSRMLS_CC);
+   }
+   }
+   return SUCCESS;
+}
+/* }}} */
+
 /*
  * Local variables:
  * tab-width: 4



-- 
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) / NEWS /ext/zlib zlib.c

2009-05-25 Thread Jani Taskinen 
janiTue May 26 04:47:05 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/zlib   zlib.c 
  Log:
  MFH:- Fixed bug #42362 (HTTP status codes 204 and 304 should not be gzipped)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1519&r2=1.2027.2.547.2.1520&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1519 php-src/NEWS:1.2027.2.547.2.1520
--- php-src/NEWS:1.2027.2.547.2.1519Mon May 25 16:30:37 2009
+++ php-src/NEWSTue May 26 04:47:04 2009
@@ -125,6 +125,8 @@
   data). (Arnaud)
 - Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC 
   driver). (jhml at gmx dot net)
+- Fixed bug #42362 (HTTP status codes 204 and 304 should not be gzipped).
+  (Scott, Edward Z. Yang)
 - Fixed bug #38805 (PDO truncates text from SQL Server text data type
   field). (Steph)
 
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.10&r2=1.183.2.6.2.11&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.10 
php-src/ext/zlib/zlib.c:1.183.2.6.2.11
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.10  Tue May 26 04:45:21 2009
+++ php-src/ext/zlib/zlib.c Tue May 26 04:47:05 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.10 2009/05/26 04:45:21 jani Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.11 2009/05/26 04:47:05 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -987,7 +987,7 @@
 {
zend_bool do_start, do_end;
 
-   if (!ZLIBG(output_compression)) {
+   if (!ZLIBG(output_compression) || SG(sapi_headers).http_response_code 
== 204 || SG(sapi_headers).http_response_code == 304) {
*handled_output = NULL;
} else {
do_start = (mode & PHP_OUTPUT_HANDLER_START ? 1 : 0);



-- 
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/zlib zlib.c

2009-05-25 Thread Jani Taskinen 
janiTue May 26 04:45:21 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/zlib   zlib.c 
  Log:
  cs + ws
  http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.9&r2=1.183.2.6.2.10&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.9 
php-src/ext/zlib/zlib.c:1.183.2.6.2.10
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.9   Thu May 14 16:17:47 2009
+++ php-src/ext/zlib/zlib.c Tue May 26 04:45:21 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.9 2009/05/14 16:17:47 lbarnaud Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.10 2009/05/26 04:45:21 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -34,47 +34,51 @@
 #include 
 #include 
 #include 
+
 #ifdef PHP_WIN32
-#define O_RDONLY _O_RDONLY
-#include "win32/param.h"
+# define O_RDONLY _O_RDONLY
+# include "win32/param.h"
 #else
-#include 
+# include 
 /* #include  */
 #endif
+
 #include "ext/standard/head.h"
 #include "safe_mode.h"
 #include "ext/standard/php_standard.h"
 #include "ext/standard/info.h"
 #include "php_zlib.h"
 #include "fopen_wrappers.h"
+
 #if HAVE_PWD_H
-#ifdef PHP_WIN32
-#include "win32/pwd.h"
-#else
-#include 
-#endif
+# ifdef PHP_WIN32
+#  include "win32/pwd.h"
+# else
+#  include 
+# endif
 #endif
+
 #if defined(HAVE_UNISTD_H) && defined(PHP_WIN32)
-#undef HAVE_UNISTD_H
+# undef HAVE_UNISTD_H
 #endif
 
 #ifdef COMPILE_DL_ZLIB
-#ifndef PUTS
-#define PUTS(a) php_printf("%s",a)
-#endif
-#ifndef PUTC
-#define PUTC(a) PUTS(a)
-#endif
-#ifndef PHPWRITE
-#define PHPWRITE(a,n) php_write((a),(n) TSRMLS_CC)
-#endif
+# ifndef PUTS
+#  define PUTS(a) php_printf("%s",a)
+# endif
+# ifndef PUTC
+#  define PUTC(a) PUTS(a)
+# endif
+# ifndef PHPWRITE
+#  define PHPWRITE(a,n) php_write((a),(n) TSRMLS_CC)
+# endif
 #endif
 
 /* Win32 needs some more memory */
 #ifdef PHP_WIN32
-#define PHP_ZLIB_MODIFIER 100
+# define PHP_ZLIB_MODIFIER 100
 #else
-#define PHP_ZLIB_MODIFIER 1000
+# define PHP_ZLIB_MODIFIER 1000
 #endif
 
 #define OS_CODE0x03 /* FIXME */
@@ -119,10 +123,10 @@
PHP_FALIAS(gzwrite, fwrite, NULL)
PHP_FALIAS(gzputs,  fwrite, NULL)
PHP_FE(gzfile,  NULL)
-   PHP_FE(gzcompress,  NULL)
-   PHP_FE(gzuncompress,NULL)
-   PHP_FE(gzdeflate,   NULL)
-   PHP_FE(gzinflate,   NULL)
+   PHP_FE(gzcompress,  NULL)
+   PHP_FE(gzuncompress,NULL)
+   PHP_FE(gzdeflate,   NULL)
+   PHP_FE(gzinflate,   NULL)
PHP_FE(gzencode,NULL)
PHP_FE(ob_gzhandler,NULL)
PHP_FE(zlib_get_coding_type,NULL)
@@ -177,7 +181,7 @@
if (new_value == NULL) {
return FAILURE;
}
-   
+
if (!strncasecmp(new_value, "off", sizeof("off"))) {
new_value = "0";
new_value_length = sizeof("0");
@@ -186,7 +190,7 @@
new_value_length = sizeof("1");
}
 
-   ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 
0); 
+   ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 
0);
if (ini_value != NULL && strlen(ini_value) != 0 && zend_atoi(new_value, 
new_value_length) != 0) {
php_error_docref("ref.outcontrol" TSRMLS_CC, E_CORE_ERROR, 
"Cannot use both zlib.output_compression and output_handler together!!");
return FAILURE;
@@ -274,7 +278,7 @@
 {
php_unregister_url_stream_wrapper("zlib" TSRMLS_CC);
php_stream_filter_unregister_factory("zlib.*" TSRMLS_CC);
-   
+
UNREGISTER_INI_ENTRIES();
 
return SUCCESS;
@@ -331,7 +335,7 @@
while (php_stream_gets(stream, buf, sizeof(buf) - 1) != NULL) {
if (PG(magic_quotes_runtime)) {
int len;
-   
+
slashed = php_addslashes(buf, 0, &len, 0 TSRMLS_CC); /* 
0 = don't free source string */
add_index_stringl(return_value, i++, slashed, len, 0);
} else {
@@ -351,7 +355,7 @@
long flags = 0;
php_stream *stream;
int use_include_path = 0;
-   
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &filename, 
&filename_len, &mode, &mode_len, &flags) == FAILURE) {
return;
}
@@ -364,7 +368,7 @@
RETURN_FALSE;
}
php_stream_to_zval(stream, return_value);
-}  
+}
 /* }}} */
 
 /*
@

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zlib zlib.c

2009-05-25 Thread Jani Taskinen 
janiTue May 26 04:44:54 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/zlib   zlib.c 
  Log:
  ws + cs
  http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.5.2.10&r2=1.183.2.6.2.5.2.11&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.10 
php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.11
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.10  Tue Mar 24 01:57:53 2009
+++ php-src/ext/zlib/zlib.c Tue May 26 04:44:54 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.5.2.10 2009/03/24 01:57:53 scottmac Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.5.2.11 2009/05/26 04:44:54 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -34,47 +34,51 @@
 #include 
 #include 
 #include 
+
 #ifdef PHP_WIN32
-#define O_RDONLY _O_RDONLY
-#include "win32/param.h"
+# define O_RDONLY _O_RDONLY
+# include "win32/param.h"
 #else
-#include 
+# include 
 /* #include  */
 #endif
+
 #include "ext/standard/head.h"
 #include "safe_mode.h"
 #include "ext/standard/php_standard.h"
 #include "ext/standard/info.h"
 #include "php_zlib.h"
 #include "fopen_wrappers.h"
+
 #if HAVE_PWD_H
-#ifdef PHP_WIN32
-#include "win32/pwd.h"
-#else
-#include 
-#endif
+# ifdef PHP_WIN32
+#  include "win32/pwd.h"
+# else
+#  include 
+# endif
 #endif
+
 #if defined(HAVE_UNISTD_H) && defined(PHP_WIN32)
-#undef HAVE_UNISTD_H
+# undef HAVE_UNISTD_H
 #endif
 
 #ifdef COMPILE_DL_ZLIB
-#ifndef PUTS
-#define PUTS(a) php_printf("%s",a)
-#endif
-#ifndef PUTC
-#define PUTC(a) PUTS(a)
-#endif
-#ifndef PHPWRITE
-#define PHPWRITE(a,n) php_write((a),(n) TSRMLS_CC)
-#endif
+# ifndef PUTS
+#  define PUTS(a) php_printf("%s",a)
+# endif
+# ifndef PUTC
+#  define PUTC(a) PUTS(a)
+# endif
+# ifndef PHPWRITE
+#  define PHPWRITE(a,n) php_write((a),(n) TSRMLS_CC)
+# endif
 #endif
 
 /* Win32 needs some more memory */
 #ifdef PHP_WIN32
-#define PHP_ZLIB_MODIFIER 100
+# define PHP_ZLIB_MODIFIER 100
 #else
-#define PHP_ZLIB_MODIFIER 1000
+# define PHP_ZLIB_MODIFIER 1000
 #endif
 
 #define OS_CODE0x03 /* FIXME */
@@ -171,10 +175,10 @@
PHP_FALIAS(gzwrite, fwrite, NULL)
PHP_FALIAS(gzputs,  fwrite, NULL)
PHP_FE(gzfile,  
arginfo_gzfile)
-   PHP_FE(gzcompress,  arginfo_gzcompress)
-   PHP_FE(gzuncompress,arginfo_gzuncompress)
-   PHP_FE(gzdeflate,   arginfo_gzdeflate)
-   PHP_FE(gzinflate,   arginfo_gzinflate)
+   PHP_FE(gzcompress,  
arginfo_gzcompress)
+   PHP_FE(gzuncompress,
arginfo_gzuncompress)
+   PHP_FE(gzdeflate,   
arginfo_gzdeflate)
+   PHP_FE(gzinflate,   
arginfo_gzinflate)
PHP_FE(gzencode,
arginfo_gzencode)
PHP_FE(ob_gzhandler,
arginfo_ob_gzhandler)
PHP_FE(zlib_get_coding_type,
arginfo_zlib_get_coding_type)
@@ -229,7 +233,7 @@
if (new_value == NULL) {
return FAILURE;
}
-   
+
if (!strncasecmp(new_value, "off", sizeof("off"))) {
new_value = "0";
new_value_length = sizeof("0");
@@ -238,7 +242,7 @@
new_value_length = sizeof("1");
}
 
-   ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 
0); 
+   ini_value = zend_ini_string("output_handler", sizeof("output_handler"), 
0);
if (ini_value != NULL && strlen(ini_value) != 0 && zend_atoi(new_value, 
new_value_length) != 0) {
php_error_docref("ref.outcontrol" TSRMLS_CC, E_CORE_ERROR, 
"Cannot use both zlib.output_compression and output_handler together!!");
return FAILURE;
@@ -326,7 +330,7 @@
 {
php_unregister_url_stream_wrapper("zlib" TSRMLS_CC);
php_stream_filter_unregister_factory("zlib.*" TSRMLS_CC);
-   
+
UNREGISTER_INI_ENTRIES();
 
return SUCCESS;
@@ -383,7 +387,7 @@
while (php_stream_gets(stream, buf, sizeof(buf) - 1) != NULL) {
if (PG(magic_quotes_runtime)) {
int len;
-   
+
slashed = php_addslashes(buf, 0, &len, 0 TSRMLS_CC); /* 
0 = don't free source string */
add_index_stringl(return_value, i++, slashed, len, 0);
} else {
@@ -403,7 +407,7 @@
long flags = 0;
php_stream *stream;
int use_include_path = 0;
-   
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &filename, 
&filename_len, &mode

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_pgsql pgsql_statement.c

2009-05-25 Thread Kalle Sommer Nielsen 
kalle   Mon May 25 19:41:41 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdo_pgsql  pgsql_statement.c 
  Log:
  MFH: Typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.14&r2=1.31.2.12.2.15&diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.14 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.15
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.14  Wed Dec 31 
11:17:42 2008
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Mon May 25 19:41:41 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.14 2008/12/31 11:17:42 sebastian Exp $ 
*/
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.15 2009/05/25 19:41:41 kalle Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -152,7 +152,7 @@
char *sqlstate = 
pdo_pgsql_sqlstate(S->result);
/* 42P05 means that the prepared 
statement already existed. this can happen if you use 
 * a connection pooling software line 
pgpool which doesn't close the db-connection once 
-* php disconnects. if php dies (no 
chanche to run RSHUTDOWN) during execution it has no 
+* php disconnects. if php dies (no 
chance to run RSHUTDOWN) during execution it has no 
 * chance to DEALLOCATE the prepared 
statements it has created. so, if we hit a 42P05 we 
 * deallocate it and retry ONCE (thies 
2005.12.15)
 */



-- 
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/pdo_pgsql pgsql_statement.c

2009-05-25 Thread Kalle Sommer Nielsen 
kalle   Mon May 25 19:41:13 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_pgsql  pgsql_statement.c 
  Log:
  MFH: Typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.7.2.12&r2=1.31.2.12.2.7.2.13&diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.12 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.13
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.12  Tue May 12 
22:18:14 2009
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Mon May 25 19:41:13 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.7.2.12 2009/05/12 22:18:14 mbeccati 
Exp $ */
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.7.2.13 2009/05/25 19:41:13 kalle Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -180,7 +180,7 @@
char *sqlstate = 
pdo_pgsql_sqlstate(S->result);
/* 42P05 means that the prepared 
statement already existed. this can happen if you use 
 * a connection pooling software line 
pgpool which doesn't close the db-connection once 
-* php disconnects. if php dies (no 
chanche to run RSHUTDOWN) during execution it has no 
+* php disconnects. if php dies (no 
chance to run RSHUTDOWN) during execution it has no 
 * chance to DEALLOCATE the prepared 
statements it has created. so, if we hit a 42P05 we 
 * deallocate it and retry ONCE (thies 
2005.12.15)
 */



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

[PHP-CVS] cvs: php-src /ext/pdo_pgsql pgsql_statement.c

2009-05-25 Thread Kalle Sommer Nielsen 
kalle   Mon May 25 19:40:49 2009 UTC

  Modified files:  
/php-src/ext/pdo_pgsql  pgsql_statement.c 
  Log:
  Typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.55&r2=1.56&diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.55 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.56
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.55Tue May 12 22:17:50 2009
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Mon May 25 19:40:49 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.55 2009/05/12 22:17:50 mbeccati Exp $ */
+/* $Id: pgsql_statement.c,v 1.56 2009/05/25 19:40:49 kalle Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -180,7 +180,7 @@
char *sqlstate = 
pdo_pgsql_sqlstate(S->result);
/* 42P05 means that the prepared 
statement already existed. this can happen if you use 
 * a connection pooling software line 
pgpool which doesn't close the db-connection once 
-* php disconnects. if php dies (no 
chanche to run RSHUTDOWN) during execution it has no 
+* php disconnects. if php dies (no 
chance to run RSHUTDOWN) during execution it has no 
 * chance to DEALLOCATE the prepared 
statements it has created. so, if we hit a 42P05 we 
 * deallocate it and retry ONCE (thies 
2005.12.15)
 */



-- 
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) / NEWS

2009-05-25 Thread Pierre-Alain Joye 
pajoye  Mon May 25 16:30:38 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - #48202
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1518&r2=1.2027.2.547.2.1519&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1518 php-src/NEWS:1.2027.2.547.2.1519
--- php-src/NEWS:1.2027.2.547.2.1518Fri May 22 11:23:21 2009
+++ php-src/NEWSMon May 25 16:30:37 2009
@@ -37,6 +37,8 @@
   with RecursiveIteratorIterator leads to a segfault). (Scott)
 - Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid
   paths). (Ilia)
+- Fixed bug #48202 (Out of Memory error message when passing invalid file path)
+  (Pierre)
 - Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
 - Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
   bindto). (Ilia)



-- 
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/xmlwriter php_xmlwriter.c /ext/xmlwriter/tests xmlwriter_open_uri_error_003.phpt xmlwriter_open_uri_error_004.phpt xmlwriter_open_uri_error_005.phpt

2009-05-25 Thread Pierre-Alain Joye 
pajoye  Mon May 25 16:27:46 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlwriter  php_xmlwriter.c 
/php-src/ext/xmlwriter/testsxmlwriter_open_uri_error_003.phpt 
xmlwriter_open_uri_error_004.phpt 
xmlwriter_open_uri_error_005.phpt 
  Log:
  - MFH: #48202, Out of memory error when passing non-existing filename, enable 
related tests (marked as XFAIL now)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.21&r2=1.20.2.12.2.22&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.21 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.22
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.21Mon May 11 
12:35:00 2009
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Mon May 25 16:27:45 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.21 2009/05/11 12:35:00 iliaa Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.22 2009/05/25 16:27:45 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -310,7 +310,10 @@
 
if (uri->scheme != NULL) {
/* absolute file uris - libxml only supports localhost or empty 
host */
-   if (strncasecmp(source, "file:///",8) == 0) {
+   if (strncasecmp(source, "file:///", 8) == 0) {
+   if (source[sizeof("file:///") - 1] == '\0') {
+   return NULL;
+   }
isFileUri = 1;
 #ifdef PHP_WIN32
source += 8;
@@ -318,6 +321,10 @@
source += 7;
 #endif
} else if (strncasecmp(source, "file://localhost/",17) == 0) {
+   if (source[sizeof("file://localhost/") - 1] == '\0') {
+   return NULL;
+   }
+
isFileUri = 1;
 #ifdef PHP_WIN32
source += 17;
@@ -330,11 +337,28 @@
file_dest = source;
 
if ((uri->scheme == NULL || isFileUri)) {
+   char file_dirname[MAXPATHLEN];
+   size_t dir_len;
+
if (!VCWD_REALPATH(source, resolved_path) && 
!expand_filepath(source, resolved_path TSRMLS_CC)) {
xmlFreeURI(uri);
return NULL;
}
+
+   memcpy(file_dirname, source, strlen(source));
+   dir_len = php_dirname(file_dirname, strlen(source));
+
+   if (dir_len > 0) {
+   struct stat buf;
+   if (php_sys_stat(file_dirname, &buf) != 0) {
+   xmlFreeURI(uri);
+   return NULL;
+   }
+   }
+
file_dest = resolved_path;
+   } else {
+   file_dest = source;
}
 
xmlFreeURI(uri);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
diff -u php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt:1.1.4.2 
php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt:1.1.4.3
--- php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt:1.1.4.2   
Sat May 16 15:14:25 2009
+++ php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt   Mon May 
25 16:27:45 2009
@@ -10,9 +10,7 @@
 Koen Kuipers koen...@gmail.com
 Theo van der Zee
 #Test Fest Utrecht 09-05-2009
---XFAIL--
-Getting error: xmlNewTextWriterFilename : out of memory!
 --EXPECTF--
 
-Warning: xmlwriter_open_uri(%s): failed to open stream: No such file or 
directory in %s on line %d
+Warning: xmlwriter_open_uri(): Unable to resolve file path in %s on line %d
 bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
diff -u php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt:1.1.4.2 
php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt:1.1.4.3
--- php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt:1.1.4.2   
Sat May 16 15:14:25 2009
+++ php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt   Mon May 
25 16:27:45 2009
@@ -10,9 +10,7 @@
 Koen Kuipers koen...@gmail.com
 Theo van der Zee
 #Test Fest Utrecht 09-05-2009
---XFAIL--
-Getting error: xmlNewTextWriterFilename : out of memory!
 --EXPECTF--
 
-Warning: xmlwriter_open_uri(/): failed to open stream: Is a directory in %s on 
line %d
+Warning: xmlwriter_open_uri(): Unable to resolve file path in %s on line %d
 bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/xmlwriter_open_uri_err

[PHP-CVS] cvs: php-src /ext/xmlwriter php_xmlwriter.c /ext/xmlwriter/tests xmlwriter_open_uri_error_003.phpt xmlwriter_open_uri_error_004.phpt xmlwriter_open_uri_error_005.phpt

2009-05-25 Thread Pierre-Alain Joye 
pajoye  Mon May 25 16:16:54 2009 UTC

  Modified files:  
/php-src/ext/xmlwriter  php_xmlwriter.c 
/php-src/ext/xmlwriter/testsxmlwriter_open_uri_error_003.phpt 
xmlwriter_open_uri_error_004.phpt 
xmlwriter_open_uri_error_005.phpt 
  Log:
  - MFB: #48202, Out of memory error when passing non-existing filename, enable 
related tests (marked as XFAIL now)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.61&r2=1.62&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.61 
php-src/ext/xmlwriter/php_xmlwriter.c:1.62
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.61  Mon May 11 12:22:19 2009
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Mon May 25 16:16:54 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.61 2009/05/11 12:22:19 iliaa Exp $ */
+/* $Id: php_xmlwriter.c,v 1.62 2009/05/25 16:16:54 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,7 +28,7 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_xmlwriter.h"
-
+#include "ext/standard/php_string.h"
 
 #if LIBXML_VERSION >= 20605
 static PHP_FUNCTION(xmlwriter_set_indent);
@@ -618,7 +618,10 @@
 
if (uri->scheme != NULL) {
/* absolute file uris - libxml only supports localhost or empty 
host */
-   if (strncasecmp(source, "file:///",8) == 0) {
+   if (strncasecmp(source, "file:///", 8) == 0) {
+   if (source[sizeof("file:///") - 1] == '\0') {
+   return NULL;
+   }
isFileUri = 1;
 #ifdef PHP_WIN32
source += 8;
@@ -626,6 +629,10 @@
source += 7;
 #endif
} else if (strncasecmp(source, "file://localhost/",17) == 0) {
+   if (source[sizeof("file://localhost/") - 1] == '\0') {
+   return NULL;
+   }
+
isFileUri = 1;
 #ifdef PHP_WIN32
source += 17;
@@ -638,11 +645,28 @@
file_dest = source;
 
if ((uri->scheme == NULL || isFileUri)) {
+   char file_dirname[MAXPATHLEN];
+   size_t dir_len;
+
if (!VCWD_REALPATH(source, resolved_path) && 
!expand_filepath(source, resolved_path TSRMLS_CC)) {
xmlFreeURI(uri);
return NULL;
}
+
+   memcpy(file_dirname, source, strlen(source));
+   dir_len = php_dirname(file_dirname, strlen(source));
+
+   if (dir_len > 0) {
+   struct stat buf;
+   if (php_sys_stat(file_dirname, &buf) != 0) {
+   xmlFreeURI(uri);
+   return NULL;
+   }
+   }
+
file_dest = resolved_path;
+   } else {
+   file_dest = source;
}
 
xmlFreeURI(uri);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
diff -u php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt:1.1 
php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt:1.2
--- php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt:1.1   Sat May 
16 15:11:21 2009
+++ php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt   Mon May 
25 16:16:54 2009
@@ -10,9 +10,7 @@
 Koen Kuipers koen...@gmail.com
 Theo van der Zee
 #Test Fest Utrecht 09-05-2009
---XFAIL--
-Getting error: xmlNewTextWriterFilename : out of memory!
 --EXPECTF--
 
-Warning: xmlwriter_open_uri(%s): failed to open stream: No such file or 
directory in %s on line %d
+Warning: xmlwriter_open_uri(): Unable to resolve file path in %s on line %d
 bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
diff -u php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt:1.1 
php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt:1.2
--- php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt:1.1   Sat May 
16 15:11:21 2009
+++ php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt   Mon May 
25 16:16:54 2009
@@ -10,9 +10,7 @@
 Koen Kuipers koen...@gmail.com
 Theo van der Zee
 #Test Fest Utrecht 09-05-2009
---XFAIL--
-Getting error: xmlNewTextWriterFilename : out of memory!
 --EXPECTF--
 
-Warning: xmlwriter_open_uri(/): failed to open stream: Is a directory in %s on 
line %d
+Warning: xmlwriter_open_uri(): Unable to resolve file path in %s on line %d
 bool(false)
http://

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/xmlwriter php_xmlwriter.c

2009-05-25 Thread Pierre-Alain Joye 
pajoye  Mon May 25 16:09:27 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/xmlwriter  php_xmlwriter.c 
  Log:
  - better fix for file:/// and file://localhost (thx Ilia), init file_dest 
when the path is an uri
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.15.2.13&r2=1.20.2.12.2.15.2.14&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.13 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.14
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.13   Mon May 25 
15:35:03 2009
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Mon May 25 16:09:27 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.13 2009/05/25 15:35:03 pajoye Exp $ 
*/
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.14 2009/05/25 16:09:27 pajoye Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -615,7 +615,7 @@
if (uri->scheme != NULL) {
/* absolute file uris - libxml only supports localhost or empty 
host */
if (strncasecmp(source, "file:///", 8) == 0) {
-   if (strlen(source) == 8) {
+   if (source[sizeof("file:///") - 1] == '\0') {
return NULL;
}
isFileUri = 1;
@@ -625,7 +625,7 @@
source += 7;
 #endif
} else if (strncasecmp(source, "file://localhost/",17) == 0) {
-   if (strlen(source) == 17) {
+   if (source[sizeof("file://localhost/") - 1] == '\0') {
return NULL;
}
 
@@ -659,6 +659,8 @@
}
 
file_dest = resolved_path;
+   } else {
+   file_dest = source;
}
 
xmlFreeURI(uri);



-- 
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/xmlwriter php_xmlwriter.c /ext/xmlwriter/tests xmlwriter_open_uri_error_003.phpt xmlwriter_open_uri_error_004.phpt xmlwriter_open_uri_error_005.phpt

2009-05-25 Thread Pierre-Alain Joye 
pajoye  Mon May 25 15:35:03 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/xmlwriter  php_xmlwriter.c 
/php-src/ext/xmlwriter/testsxmlwriter_open_uri_error_003.phpt 
xmlwriter_open_uri_error_004.phpt 
xmlwriter_open_uri_error_005.phpt 
  Log:
  - #48202, Out of memory error when passing non-existing filename, enable 
related tests (marked as XFAIL now)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.15.2.12&r2=1.20.2.12.2.15.2.13&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.12 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.13
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.12   Mon May 11 
12:21:26 2009
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Mon May 25 15:35:03 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.12 2009/05/11 12:21:26 iliaa Exp $ 
*/
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.13 2009/05/25 15:35:03 pajoye Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,7 +28,7 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_xmlwriter.h"
-
+#include "ext/standard/php_string.h"
 
 #if LIBXML_VERSION >= 20605
 static PHP_FUNCTION(xmlwriter_set_indent);
@@ -614,7 +614,10 @@
 
if (uri->scheme != NULL) {
/* absolute file uris - libxml only supports localhost or empty 
host */
-   if (strncasecmp(source, "file:///",8) == 0) {
+   if (strncasecmp(source, "file:///", 8) == 0) {
+   if (strlen(source) == 8) {
+   return NULL;
+   }
isFileUri = 1;
 #ifdef PHP_WIN32
source += 8;
@@ -622,6 +625,10 @@
source += 7;
 #endif
} else if (strncasecmp(source, "file://localhost/",17) == 0) {
+   if (strlen(source) == 17) {
+   return NULL;
+   }
+
isFileUri = 1;
 #ifdef PHP_WIN32
source += 17;
@@ -631,13 +638,26 @@
}
}
 
-   file_dest = source;
-
if ((uri->scheme == NULL || isFileUri)) {
+   char file_dirname[MAXPATHLEN];
+   size_t dir_len;
+
if (!VCWD_REALPATH(source, resolved_path) && 
!expand_filepath(source, resolved_path TSRMLS_CC)) {
xmlFreeURI(uri);
return NULL;
}
+
+   memcpy(file_dirname, source, strlen(source));
+   dir_len = php_dirname(file_dirname, strlen(source));
+
+   if (dir_len > 0) {
+   struct stat buf;
+   if (php_sys_stat(file_dirname, &buf) != 0) {
+   xmlFreeURI(uri);
+   return NULL;
+   }
+   }
+
file_dest = resolved_path;
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
diff -u php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt:1.1.2.2 
php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt:1.1.2.3
--- php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt:1.1.2.2   
Sat May 16 15:13:57 2009
+++ php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt   Mon May 
25 15:35:03 2009
@@ -10,9 +10,7 @@
 Koen Kuipers koen...@gmail.com
 Theo van der Zee
 #Test Fest Utrecht 09-05-2009
---XFAIL--
-Getting error: xmlNewTextWriterFilename : out of memory!
 --EXPECTF--
 
-Warning: xmlwriter_open_uri(%s): failed to open stream: No such file or 
directory in %s on line %d
+Warning: xmlwriter_open_uri(): Unable to resolve file path in %s on line %d
 bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
diff -u php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt:1.1.2.2 
php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt:1.1.2.3
--- php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt:1.1.2.2   
Sat May 16 15:13:57 2009
+++ php-src/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt   Mon May 
25 15:35:03 2009
@@ -10,9 +10,7 @@
 Koen Kuipers koen...@gmail.com
 Theo van der Zee
 #Test Fest Utrecht 09-05-2009
---XFAIL--
-Getting error: xmlNewTextWriterFilename : out of memory!
 --EXPECTF--
 
-Warning: xmlwriter_open_uri(/): failed to open stream: Is a directory in %s on 
line %d
+Warning: xmlwriter_op

[PHP-CVS] cvs: php-src /ext/standard file.c

2009-05-25 Thread Ilia Alshanetsky 
iliaa   Mon May 25 13:02:55 2009 UTC

  Modified files:  
/php-src/ext/standard   file.c 
  Log:
  
  MFB: Fixed bug #48313 (fgetcsv() return empty string rather then NULL for
  empty rows)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.546&r2=1.547&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.546 php-src/ext/standard/file.c:1.547
--- php-src/ext/standard/file.c:1.546   Thu May 21 01:39:48 2009
+++ php-src/ext/standard/file.c Mon May 25 13:02:55 2009
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: file.c,v 1.546 2009/05/21 01:39:48 jani Exp $ */
+/* $Id: file.c,v 1.547 2009/05/25 13:02:55 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -2360,6 +2360,15 @@
 
array_init(return_value);
 
+   while (*p == ' ' || *p == '\t') {
+   p++;
+   }
+
+   if (*p == '\r' || *p == '\n') {
+   add_next_index_null(return_value);
+   goto end;
+   }
+
while(p < e) {
switch (state) {
case PHP_FGETCSV_READY:
@@ -2551,7 +2560,7 @@
break;
}
}
-
+end:
if (stream) {
efree(buffer);
}
@@ -2568,6 +2577,15 @@
 
array_init(return_value);
 
+   while (*p == ' ' || *p == '\t') {
+   p++;
+   }
+
+   if (*p == '\r' || *p == '\n') {
+   add_next_index_null(return_value);
+   goto end;
+   }
+
while(p < e) {
switch (state) {
case PHP_FGETCSV_READY:
@@ -2756,7 +2774,7 @@
break;
}
}
-
+end:
if (stream) {
efree(buffer);
}



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

[PHP-CVS] cvs: phpruntests /src BuildClassMap.php rtAutoload.php rtClassMap.php rtDirectoryList.php rtPhptFilterIterator.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:48:40 2009 UTC

  Modified files:  
/phpruntests/srcBuildClassMap.php rtDirectoryList.php 
rtPhptFilterIterator.php rtClassMap.php 
rtAutoload.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/BuildClassMap.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/src/BuildClassMap.php
diff -u phpruntests/src/BuildClassMap.php:1.4 
phpruntests/src/BuildClassMap.php:1.5
--- phpruntests/src/BuildClassMap.php:1.4   Mon May 25 12:39:46 2009
+++ phpruntests/src/BuildClassMap.php   Mon May 25 12:48:40 2009
@@ -6,7 +6,7 @@
  * It assumes that all classes have the same name at the file name (less .php) 
 and all are prefixed by 'rt'
  *
  * @category   Testing
- * @packagerun-tests
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtDirectoryList.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/src/rtDirectoryList.php
diff -u phpruntests/src/rtDirectoryList.php:1.4 
phpruntests/src/rtDirectoryList.php:1.5
--- phpruntests/src/rtDirectoryList.php:1.4 Mon May 25 12:39:46 2009
+++ phpruntests/src/rtDirectoryList.php Mon May 25 12:48:40 2009
@@ -6,7 +6,7 @@
  * This is currently not used for anything
  * 
  * @category   Testing
- * @packagerun-tests
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtPhptFilterIterator.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/rtPhptFilterIterator.php
diff -u phpruntests/src/rtPhptFilterIterator.php:1.3 
phpruntests/src/rtPhptFilterIterator.php:1.4
--- phpruntests/src/rtPhptFilterIterator.php:1.3Mon May 25 12:39:46 2009
+++ phpruntests/src/rtPhptFilterIterator.phpMon May 25 12:48:40 2009
@@ -5,7 +5,7 @@
  * Filter for .phpt file types
  * 
  * @category   Testing
- * @packagerun-tests
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtClassMap.php?r1=1.10&r2=1.11&diff_format=u
Index: phpruntests/src/rtClassMap.php
diff -u phpruntests/src/rtClassMap.php:1.10 phpruntests/src/rtClassMap.php:1.11
--- phpruntests/src/rtClassMap.php:1.10 Mon May 25 12:39:46 2009
+++ phpruntests/src/rtClassMap.php  Mon May 25 12:48:40 2009
@@ -9,7 +9,7 @@
  * To re-generate this file, run the script BuildClassMap.php.
  * 
  * @category   Testing
- * @packagerun-tests
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtAutoload.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/rtAutoload.php
diff -u phpruntests/src/rtAutoload.php:1.3 phpruntests/src/rtAutoload.php:1.4
--- phpruntests/src/rtAutoload.php:1.3  Mon May 25 12:39:46 2009
+++ phpruntests/src/rtAutoload.php  Mon May 25 12:48:40 2009
@@ -6,7 +6,7 @@
  * defining the file to load each class from.
  * 
  * @category   Testing
- * @packagerun-tests
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group



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

[PHP-CVS] cvs: phpruntests /src/testcase rtPhpTest.php rtPhpTestFile.php rtTestDifference.php rtTestOutputWriter.php rtTestPreCondition.php rtTestResults.php /src/testgroup rtPhpTestGroup.php /src/t

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:46:57 2009 UTC

  Modified files:  
/phpruntests/src/testcase   rtPhpTest.php rtTestOutputWriter.php 
rtTestPreCondition.php rtTestResults.php 
rtPhpTestFile.php rtTestDifference.php 
/phpruntests/src/testrunrtPhpTestRun.php 
/phpruntests/src/testgroup  rtPhpTestGroup.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtPhpTest.php?r1=1.8&r2=1.9&diff_format=u
Index: phpruntests/src/testcase/rtPhpTest.php
diff -u phpruntests/src/testcase/rtPhpTest.php:1.8 
phpruntests/src/testcase/rtPhpTest.php:1.9
--- phpruntests/src/testcase/rtPhpTest.php:1.8  Mon May 25 12:28:40 2009
+++ phpruntests/src/testcase/rtPhpTest.php  Mon May 25 12:46:57 2009
@@ -4,8 +4,8 @@
  *
  * This class represents a single phpt test case.
  *
- * @category   Quality Assurance
- * @packagerun-tests
+ * @category   Testing
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestOutputWriter.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testcase/rtTestOutputWriter.php
diff -u phpruntests/src/testcase/rtTestOutputWriter.php:1.3 
phpruntests/src/testcase/rtTestOutputWriter.php:1.4
--- phpruntests/src/testcase/rtTestOutputWriter.php:1.3 Mon May 25 12:28:40 2009
+++ phpruntests/src/testcase/rtTestOutputWriter.php Mon May 25 12:46:57 2009
@@ -5,8 +5,8 @@
  * Writes test output. This is concerned with status (PASS, FAIL etc) not
  * with the log files.
  *
- * @category   Quality Assurance
- * @packagerun-tests
+ * @category   Testing
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestPreCondition.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testcase/rtTestPreCondition.php
diff -u phpruntests/src/testcase/rtTestPreCondition.php:1.3 
phpruntests/src/testcase/rtTestPreCondition.php:1.4
--- phpruntests/src/testcase/rtTestPreCondition.php:1.3 Mon May 25 12:28:40 2009
+++ phpruntests/src/testcase/rtTestPreCondition.php Mon May 25 12:46:57 2009
@@ -4,8 +4,8 @@
  *
  * Parent class for test case pre-conditions
  *
- * @category   Quality Assurance
- * @packagerun-tests
+ * @category   Testing
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestResults.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testcase/rtTestResults.php
diff -u phpruntests/src/testcase/rtTestResults.php:1.3 
phpruntests/src/testcase/rtTestResults.php:1.4
--- phpruntests/src/testcase/rtTestResults.php:1.3  Mon May 25 12:28:40 2009
+++ phpruntests/src/testcase/rtTestResults.php  Mon May 25 12:46:57 2009
@@ -9,8 +9,8 @@
  * Maintains (adds to) the tests case status to give a final status array
  * Request calculation of difference between expected/actual output if the 
test has failed.
  *
- * @category   Quality Assurance
- * @packagerun-tests
+ * @category   Testing
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtPhpTestFile.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testcase/rtPhpTestFile.php
diff -u phpruntests/src/testcase/rtPhpTestFile.php:1.3 
phpruntests/src/testcase/rtPhpTestFile.php:1.4
--- phpruntests/src/testcase/rtPhpTestFile.php:1.3  Mon May 25 12:28:40 2009
+++ phpruntests/src/testcase/rtPhpTestFile.php  Mon May 25 12:46:57 2009
@@ -4,8 +4,8 @@
  *
  * Reads the test file and checks pre-conditions
  *
- * @category   Quality Assurance
- * @packagerun-tests
+ * @category   Testing
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestDifference.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testcase/rtTestDifference.php
diff -u phpruntests/src/testcase/rtTestDifference.php:1.3 
phpruntests/src/testcase/rtTestDifference.php:1.4
--- phpruntests/src/testcase/rtTestDifference.php:1.3   Mon May 25 12:28:40 2009
+++ phpruntests/src/testcase/rtTestDifference.php   Mon May 25 12:46:57 2009
@@ -5,8 +5,8 @@
  * Calculates difference between actual and expected output.
  * Exact import from run-tests.php
  *
- * @category   Quality Assurance
- * @packagerun-tests
+ * @category   Testing
+ * @packageRUNTESTS
  * @author Zoe Slattery 
  * @author Stefan Priebsch 
  * @copyright  2009 The PHP Group
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.8&r2=1.9&diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.p

[PHP-CVS] cvs: phpruntests /src BuildClassMap.php rtAutoload.php rtClassMap.php rtDirectoryList.php rtPhptFilterIterator.php rtText.php rtUtil.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:39:47 2009 UTC

  Modified files:  
/phpruntests/srcBuildClassMap.php rtText.php rtDirectoryList.php 
rtUtil.php rtPhptFilterIterator.php rtClassMap.php 
rtAutoload.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/BuildClassMap.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/BuildClassMap.php
diff -u phpruntests/src/BuildClassMap.php:1.3 
phpruntests/src/BuildClassMap.php:1.4
--- phpruntests/src/BuildClassMap.php:1.3   Mon May 11 13:20:55 2009
+++ phpruntests/src/BuildClassMap.php   Mon May 25 12:39:46 2009
@@ -1,8 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ *
  */
 
 $map = new BuildClassMap();
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtText.php?r1=1.5&r2=1.6&diff_format=u
Index: phpruntests/src/rtText.php
diff -u phpruntests/src/rtText.php:1.5 phpruntests/src/rtText.php:1.6
--- phpruntests/src/rtText.php:1.5  Sat Apr 25 14:26:43 2009
+++ phpruntests/src/rtText.php  Mon May 25 12:39:46 2009
@@ -2,21 +2,9 @@
 /**
  * rtText
  *
- * @category  Testing
- * @package   RUNTESTS
- * @authorZoe Slattery 
- * @authorStefan Priebsch 
- * @copyright 2009 The PHP Group
- * @license   http://www.php.net/license/3_01.txt PHP License 3.01
- * @link  http://qa.php.net/
- */
-
-/**
- * Reads texts stored in texts/ subdirectory
- *
  * rtText reads named texts from texts/ subdirectory
  * optionally replacing %n placeholders.
- *
+ * 
  * @category  Testing
  * @package   RUNTESTS
  * @authorZoe Slattery 
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtDirectoryList.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/rtDirectoryList.php
diff -u phpruntests/src/rtDirectoryList.php:1.3 
phpruntests/src/rtDirectoryList.php:1.4
--- phpruntests/src/rtDirectoryList.php:1.3 Mon Apr 20 20:24:30 2009
+++ phpruntests/src/rtDirectoryList.php Mon May 25 12:39:46 2009
@@ -1,8 +1,16 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
  *
  */
 class rtDirectoryList
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtUtil.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/rtUtil.php
diff -u phpruntests/src/rtUtil.php:1.2 phpruntests/src/rtUtil.php:1.3
--- phpruntests/src/rtUtil.php:1.2  Mon Apr 20 16:57:31 2009
+++ phpruntests/src/rtUtil.php  Mon May 25 12:39:46 2009
@@ -1,7 +1,16 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 class rtUtil
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtPhptFilterIterator.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/rtPhptFilterIterator.php
diff -u phpruntests/src/rtPhptFilterIterator.php:1.2 
phpruntests/src/rtPhptFilterIterator.php:1.3
--- phpruntests/src/rtPhptFilterIterator.php:1.2Mon Apr 20 16:57:31 2009
+++ phpruntests/src/rtPhptFilterIterator.phpMon May 25 12:39:46 2009
@@ -1,6 +1,15 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
  *
  */
 class rtPhptFilterIterator extends FilterIterator
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtClassMap.php?r1=1.9&r2=1.10&diff_format=u
Index: phpruntests/src/rtClassMap.php
diff -u phpruntests/src/rtClassMap.php:1.9 phpruntests/src/rtClassMap.php:1.10
--- phpruntests/src/rtClassMap.php:1.9  Fri May 15 09:58:21 2009
+++ phpruntests/src/rtClassMap.php  Mon May 25 12:39:46 2009
@@ -1,10 +1,20 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ *
  */
 $rtClassMap = array(
 'rtEnvironmentException'   => 
'configuration/exceptions/rtEnvironmentException.php',
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtAutoload.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/rtAutoload.php
diff -u phpruntests/src/rtAutoload.php:1.2 phpruntests/src/rtAutoload.php:1.3
--- phpruntests/src/rtAutoload.php:1.2  Mon Apr 20 16:57:31 2009
+++ phpruntests/src/rtAutoload.php  Mon May 25 12:39:46 2009
@@ -1,11 +1,21 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ *
  */
+
+rtAutoload::init();
+
 class rtAutoload
 {
 /**



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

[PHP-CVS] cvs: phpruntests /src/testgroup rtPhpTestGroup.php /src/testrun rtPhpTestRun.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:30:44 2009 UTC

  Modified files:  
/phpruntests/src/testrunrtPhpTestRun.php 
/phpruntests/src/testgroup  rtPhpTestGroup.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.7&r2=1.8&diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.7 
phpruntests/src/testrun/rtPhpTestRun.php:1.8
--- phpruntests/src/testrun/rtPhpTestRun.php:1.7Sun May 17 13:58:51 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpMon May 25 12:30:44 2009
@@ -1,6 +1,15 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
  *
  */
 class rtPhpTestRun
http://cvs.php.net/viewvc.cgi/phpruntests/src/testgroup/rtPhpTestGroup.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/src/testgroup/rtPhpTestGroup.php
diff -u phpruntests/src/testgroup/rtPhpTestGroup.php:1.4 
phpruntests/src/testgroup/rtPhpTestGroup.php:1.5
--- phpruntests/src/testgroup/rtPhpTestGroup.php:1.4Fri Apr 24 08:52:21 2009
+++ phpruntests/src/testgroup/rtPhpTestGroup.phpMon May 25 12:30:44 2009
@@ -1,7 +1,16 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ *
  */
 class rtPhpTestGroup
 {



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

[PHP-CVS] cvs: phpruntests /src/testcase rtPhpRunner.php rtPhpTest.php rtPhpTestFile.php rtTestConfiguration.php rtTestDifference.php rtTestOutputWriter.php rtTestPreCondition.php rtTestResults.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:28:40 2009 UTC

  Modified files:  
/phpruntests/src/testcase   rtPhpTest.php rtTestOutputWriter.php 
rtTestPreCondition.php rtTestResults.php 
rtTestConfiguration.php rtPhpTestFile.php 
rtTestDifference.php rtPhpRunner.php 
  Log:
  doc blocks
  http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtPhpTest.php?r1=1.7&r2=1.8&diff_format=u
Index: phpruntests/src/testcase/rtPhpTest.php
diff -u phpruntests/src/testcase/rtPhpTest.php:1.7 
phpruntests/src/testcase/rtPhpTest.php:1.8
--- phpruntests/src/testcase/rtPhpTest.php:1.7  Sun May 17 19:57:26 2009
+++ phpruntests/src/testcase/rtPhpTest.php  Mon May 25 12:28:40 2009
@@ -1,5 +1,6 @@
 http://www.php.net/license/3_01.txt  PHP License 3.01
  *
  */
-
 class rtPhpTest
 {
 public $testConfiguration;
@@ -34,6 +34,9 @@
 $this->init($runConfiguration);
 }
 
+/**
+ * Creates a section object for each test section
+ */
 public function parse()
 {
 for ($i=0; $icontents); $i++) {
@@ -67,13 +70,25 @@
 
 $this->fileSection->setExecutableFileName($this->getName());
 }
+
 
+/**
+ * Initialises the configuration for this test. Uses the configuration 
sections from teh test case
+ * 
+ * @param rtRunTEstsConfiuration $runConfiguration
+ * 
+ */
 public function init(rtRuntestsConfiguration $runConfiguration)
 {
 $this->testConfiguration = new rtTestConfiguration($runConfiguration, 
$this->sections, $this->sectionHeadings, $this->fileSection);
 }
+
 
-//run
+/**
+ * Executes the test case
+ * 
+ * @param rtRunTEstsConfiuration $runConfiguration
+ */
 public function executeTest(rtRuntestsConfiguration $runConfiguration)
 {
 $this->status = array();
@@ -103,6 +118,10 @@
 }
 }
 
+/**
+ * Test the output against the expect section
+ * 
+ */
 public function compareOutput()
 {
 $result = $this->expectSection->compare($this->output);
@@ -114,6 +133,11 @@
 }
 }
 
+
+/**
+ * Test the expected headers against actual headers. Only relevant for CGI 
tests.
+ * 
+ */
 public function compareHeaders()
 {
 $result = $this->sections['EXPECTHEADERS']->compare($this->headers);
@@ -125,6 +149,11 @@
 }
 }
 
+
+/**
+ * Identify a section heading
+ * 
+ */
 private function isSectionKey($line)
 {
 if (in_array($line, $this->sectionHeadings)) {
@@ -134,6 +163,9 @@
 }
 
 
+/**
+ * Set the test's file section
+ */
 private function setFileSection()
 {
 if (array_key_exists('FILE', $this->sections)) {
@@ -149,6 +181,10 @@
 }
 }
 
+
+/**
+ * Sets the test's expect section
+ */
 private function setExpectSection()
 {
 if (array_key_exists('EXPECT', $this->sections)) {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestOutputWriter.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/rtTestOutputWriter.php
diff -u phpruntests/src/testcase/rtTestOutputWriter.php:1.2 
phpruntests/src/testcase/rtTestOutputWriter.php:1.3
--- phpruntests/src/testcase/rtTestOutputWriter.php:1.2 Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/rtTestOutputWriter.php Mon May 25 12:28:40 2009
@@ -1,6 +1,16 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
  *
  */
 abstract class rtTestOutputWriter
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestPreCondition.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/rtTestPreCondition.php
diff -u phpruntests/src/testcase/rtTestPreCondition.php:1.2 
phpruntests/src/testcase/rtTestPreCondition.php:1.3
--- phpruntests/src/testcase/rtTestPreCondition.php:1.2 Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/rtTestPreCondition.php Mon May 25 12:28:40 2009
@@ -1,5 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ *
+ */
 interface rtTestPreCondition
 {
 public function isMet(array $testContents);
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestResults.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/rtTestResults.php
diff -u phpruntests/src/testcase/rtTestResults.php:1.2 
phpruntests/src/testcase/rtTestResults.php:1.3
--- phpruntests/src/testcase/rtTestResults.php:1.2  Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/rtTestResults.php  Mon May 25 12:28:40 2009
@@ -1,5 +1,7 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ *
  */
 class rtTestResults
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src

[PHP-CVS] cvs: phpruntests /src/testcase/sections rtConfigurationSection.php rtExecutableSection.php rtInformationSection.php rtOutputSection.php rtSection.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:17:56 2009 UTC

  Modified files:  
/phpruntests/src/testcase/sections  rtInformationSection.php 
rtExecutableSection.php 
rtConfigurationSection.php 
rtOutputSection.php 
rtSection.php 
  Log:
  doc blocs
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/rtInformationSection.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/sections/rtInformationSection.php
diff -u phpruntests/src/testcase/sections/rtInformationSection.php:1.2 
phpruntests/src/testcase/sections/rtInformationSection.php:1.3
--- phpruntests/src/testcase/sections/rtInformationSection.php:1.2  Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/testcase/sections/rtInformationSection.php  Mon May 25 
12:17:56 2009
@@ -1,7 +1,17 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 class rtInformationSection extends rtSection
 {  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/rtExecutableSection.php?r1=1.6&r2=1.7&diff_format=u
Index: phpruntests/src/testcase/sections/rtExecutableSection.php
diff -u phpruntests/src/testcase/sections/rtExecutableSection.php:1.6 
phpruntests/src/testcase/sections/rtExecutableSection.php:1.7
--- phpruntests/src/testcase/sections/rtExecutableSection.php:1.6   Mon May 
18 19:27:33 2009
+++ phpruntests/src/testcase/sections/rtExecutableSection.php   Mon May 25 
12:17:56 2009
@@ -1,6 +1,17 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 abstract class rtExecutableSection extends rtSection
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/rtConfigurationSection.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/sections/rtConfigurationSection.php
diff -u phpruntests/src/testcase/sections/rtConfigurationSection.php:1.2 
phpruntests/src/testcase/sections/rtConfigurationSection.php:1.3
--- phpruntests/src/testcase/sections/rtConfigurationSection.php:1.2Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/testcase/sections/rtConfigurationSection.phpMon May 
25 12:17:56 2009
@@ -1,6 +1,17 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 abstract class rtConfigurationSection extends rtSection
 {  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/rtOutputSection.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/sections/rtOutputSection.php
diff -u phpruntests/src/testcase/sections/rtOutputSection.php:1.2 
phpruntests/src/testcase/sections/rtOutputSection.php:1.3
--- phpruntests/src/testcase/sections/rtOutputSection.php:1.2   Fri Apr 24 
08:41:26 2009
+++ phpruntests/src/testcase/sections/rtOutputSection.php   Mon May 25 
12:17:56 2009
@@ -1,7 +1,17 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 abstract class rtOutputSection extends rtSection
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/rtSection.php?r1=1.11&r2=1.12&diff_format=u
Index: phpruntests/src/testcase/sections/rtSection.php
diff -u phpruntests/src/testcase/sections/rtSection.php:1.11 
phpruntests/src/testcase/sections/rtSection.php:1.12
--- phpruntests/src/testcase/sections/rtSection.php:1.11Sun May 17 
12:52:16 2009
+++ phpruntests/src/testcase/sections/rtSection.php Mon May 25 12:17:56 2009
@@ -1,7 +1,17 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 abstract class rtSection
 {



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

[PHP-CVS] cvs: phpruntests /src/testcase/sections/outputsections rtExpectHeadersSection.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:13:22 2009 UTC

  Modified files:  
/phpruntests/src/testcase/sections/outputsections   

rtExpectHeadersSection.php 
  Log:
  oops
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php?r1=1.2&r2=1.3&diff_format=u
Index: 
phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php
diff -u 
phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php:1.2 
phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php:1.3
--- 
phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php:1.2 
Mon May 25 12:12:47 2009
+++ phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php 
Mon May 25 12:13:22 2009
@@ -12,9 +12,6 @@
  * @license   http://www.php.net/license/3_01.txt PHP License 3.01
  * @link  http://qa.php.net/
  */
-/**
- * Class representing expected output and actual headers
- */
 class rtExpectHeadersSection extends rtOutputSection
 {
 protected $expectedHeaders = array();



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

[PHP-CVS] cvs: phpruntests /src/testcase/sections/outputsections rtExpectFSection.php rtExpectHeadersSection.php rtExpectRegexSection.php rtExpectSection.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:12:47 2009 UTC

  Modified files:  
/phpruntests/src/testcase/sections/outputsections   
rtExpectSection.php 

rtExpectRegexSection.php 

rtExpectHeadersSection.php 
rtExpectFSection.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/outputsections/rtExpectSection.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/sections/outputsections/rtExpectSection.php
diff -u 
phpruntests/src/testcase/sections/outputsections/rtExpectSection.php:1.2 
phpruntests/src/testcase/sections/outputsections/rtExpectSection.php:1.3
--- phpruntests/src/testcase/sections/outputsections/rtExpectSection.php:1.2
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/sections/outputsections/rtExpectSection.php
Mon May 25 12:12:47 2009
@@ -1,6 +1,16 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 class rtExpectSection extends rtOutputSection
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/outputsections/rtExpectRegexSection.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/sections/outputsections/rtExpectRegexSection.php
diff -u 
phpruntests/src/testcase/sections/outputsections/rtExpectRegexSection.php:1.2 
phpruntests/src/testcase/sections/outputsections/rtExpectRegexSection.php:1.3
--- 
phpruntests/src/testcase/sections/outputsections/rtExpectRegexSection.php:1.2   
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/sections/outputsections/rtExpectRegexSection.php   
Mon May 25 12:12:47 2009
@@ -1,6 +1,16 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 class rtExpectRegexSection extends rtOutputSection
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php?r1=1.1&r2=1.2&diff_format=u
Index: 
phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php
diff -u 
phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php:1.1 
phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php:1.2
--- 
phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php:1.1 
Thu May 14 19:56:30 2009
+++ phpruntests/src/testcase/sections/outputsections/rtExpectHeadersSection.php 
Mon May 25 12:12:47 2009
@@ -1,7 +1,7 @@
 http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php
diff -u 
phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php:1.3 
phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php:1.4
--- phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php:1.3   
Wed May 13 16:58:27 2009
+++ phpruntests/src/testcase/sections/outputsections/rtExpectFSection.php   
Mon May 25 12:12:47 2009
@@ -1,6 +1,16 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 class rtExpectFSection extends rtOutputSection
 {



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

[PHP-CVS] cvs: phpruntests /src/testcase/sections/informationsections rtCreditsSection.php rtTestHeaderSection.php rtXfailSection.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:09:17 2009 UTC

  Modified files:  
/phpruntests/src/testcase/sections/informationsections  

rtTestHeaderSection.php 

rtCreditsSection.php 

rtXfailSection.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/informationsections/rtTestHeaderSection.php?r1=1.2&r2=1.3&diff_format=u
Index: 
phpruntests/src/testcase/sections/informationsections/rtTestHeaderSection.php
diff -u 
phpruntests/src/testcase/sections/informationsections/rtTestHeaderSection.php:1.2
 
phpruntests/src/testcase/sections/informationsections/rtTestHeaderSection.php:1.3
--- 
phpruntests/src/testcase/sections/informationsections/rtTestHeaderSection.php:1.2
   Fri Apr 24 08:41:26 2009
+++ 
phpruntests/src/testcase/sections/informationsections/rtTestHeaderSection.php   
Mon May 25 12:09:17 2009
@@ -1,6 +1,16 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 class rtTestHeaderSection extends rtInformationSection
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/informationsections/rtCreditsSection.php?r1=1.2&r2=1.3&diff_format=u
Index: 
phpruntests/src/testcase/sections/informationsections/rtCreditsSection.php
diff -u 
phpruntests/src/testcase/sections/informationsections/rtCreditsSection.php:1.2 
phpruntests/src/testcase/sections/informationsections/rtCreditsSection.php:1.3
--- 
phpruntests/src/testcase/sections/informationsections/rtCreditsSection.php:1.2  
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/sections/informationsections/rtCreditsSection.php  
Mon May 25 12:09:17 2009
@@ -1,7 +1,16 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 class rtCreditsSection extends rtInformationSection
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/informationsections/rtXfailSection.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/sections/informationsections/rtXfailSection.php
diff -u 
phpruntests/src/testcase/sections/informationsections/rtXfailSection.php:1.2 
phpruntests/src/testcase/sections/informationsections/rtXfailSection.php:1.3
--- 
phpruntests/src/testcase/sections/informationsections/rtXfailSection.php:1.2
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/sections/informationsections/rtXfailSection.php
Mon May 25 12:09:17 2009
@@ -1,7 +1,16 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 class rtXfailSection extends rtInformationSection
 {



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

[PHP-CVS] cvs: phpruntests /src/testcase/sections/executablesections rtCleanSection.php rtSkipIfSection.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:05:46 2009 UTC

  Modified files:  
/phpruntests/src/testcase/sections/executablesections   

rtCleanSection.php 

rtSkipIfSection.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtCleanSection.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testcase/sections/executablesections/rtCleanSection.php
diff -u 
phpruntests/src/testcase/sections/executablesections/rtCleanSection.php:1.3 
phpruntests/src/testcase/sections/executablesections/rtCleanSection.php:1.4
--- phpruntests/src/testcase/sections/executablesections/rtCleanSection.php:1.3 
Sun Apr 26 07:17:14 2009
+++ phpruntests/src/testcase/sections/executablesections/rtCleanSection.php 
Mon May 25 12:05:46 2009
@@ -1,20 +1,9 @@
 
- * @authorStefan Priebsch 
- * @copyright 2009 The PHP Group
- * @license   http://www.php.net/license/3_01.txt PHP License 3.01
- * @link  http://qa.php.net/
- */
-
-/**
+ * 
  * Executes the code in the --CLEAN-- section
  *
- *
  * @category  Testing
  * @package   RUNTESTS
  * @authorZoe Slattery 
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php
diff -u 
phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php:1.3 
phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php:1.4
--- 
phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php:1.3
Sun Apr 26 07:17:14 2009
+++ phpruntests/src/testcase/sections/executablesections/rtSkipIfSection.php
Mon May 25 12:05:46 2009
@@ -1,19 +1,8 @@
 
- * @authorStefan Priebsch 
- * @copyright 2009 The PHP Group
- * @license   http://www.php.net/license/3_01.txt PHP License 3.01
- * @link  http://qa.php.net/
- */
-
-/**
- * Executes the code in the --SKIPIF-- section
- *
+ * 
+ *  Executes the code in the --SKIPIF-- section
  *
  * @category  Testing
  * @package   RUNTESTS



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

[PHP-CVS] cvs: phpruntests /src/testcase/sections/configurationsections rtArgsSection.php rtEnvSection.php rtIniSection.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:04:16 2009 UTC

  Modified files:  
/phpruntests/src/testcase/sections/configurationsections

rtArgsSection.php 

rtIniSection.php 

rtEnvSection.php 
  Log:
  doc blocks
  
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtArgsSection.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/sections/configurationsections/rtArgsSection.php
diff -u 
phpruntests/src/testcase/sections/configurationsections/rtArgsSection.php:1.2 
phpruntests/src/testcase/sections/configurationsections/rtArgsSection.php:1.3
--- 
phpruntests/src/testcase/sections/configurationsections/rtArgsSection.php:1.2   
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/sections/configurationsections/rtArgsSection.php   
Mon May 25 12:04:16 2009
@@ -1,6 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtArgsSection extends rtConfigurationSection
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtIniSection.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/sections/configurationsections/rtIniSection.php
diff -u 
phpruntests/src/testcase/sections/configurationsections/rtIniSection.php:1.2 
phpruntests/src/testcase/sections/configurationsections/rtIniSection.php:1.3
--- 
phpruntests/src/testcase/sections/configurationsections/rtIniSection.php:1.2
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/sections/configurationsections/rtIniSection.php
Mon May 25 12:04:16 2009
@@ -1,6 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtIniSection extends rtConfigurationSection
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtEnvSection.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/testcase/sections/configurationsections/rtEnvSection.php
diff -u 
phpruntests/src/testcase/sections/configurationsections/rtEnvSection.php:1.3 
phpruntests/src/testcase/sections/configurationsections/rtEnvSection.php:1.4
--- 
phpruntests/src/testcase/sections/configurationsections/rtEnvSection.php:1.3
Mon May 18 20:06:11 2009
+++ phpruntests/src/testcase/sections/configurationsections/rtEnvSection.php
Mon May 25 12:04:16 2009
@@ -1,6 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtEnvSection extends rtConfigurationSection
 {



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

[PHP-CVS] cvs: phpruntests /src/testcase/preconditions rtHasMandatorySections.php rtHasNoDuplicateSections.php rtIsSectionImplemented.php rtIsValidSectionName.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 12:00:11 2009 UTC

  Modified files:  
/phpruntests/src/testcase/preconditions rtIsValidSectionName.php 
rtHasNoDuplicateSections.php 
rtIsSectionImplemented.php 
rtHasMandatorySections.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/preconditions/rtIsValidSectionName.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/preconditions/rtIsValidSectionName.php
diff -u phpruntests/src/testcase/preconditions/rtIsValidSectionName.php:1.2 
phpruntests/src/testcase/preconditions/rtIsValidSectionName.php:1.3
--- phpruntests/src/testcase/preconditions/rtIsValidSectionName.php:1.2 Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/testcase/preconditions/rtIsValidSectionName.php Mon May 
25 12:00:11 2009
@@ -1,6 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtIsValidSectionName implements rtTestPreCondition
 {
@@ -29,7 +40,6 @@
 'REDIRECTTEST', 
 'HEADERS',
 'EXPECTHEADERS',   
-'===DONE===',
 );
 
 /**
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/preconditions/rtHasNoDuplicateSections.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/preconditions/rtHasNoDuplicateSections.php
diff -u phpruntests/src/testcase/preconditions/rtHasNoDuplicateSections.php:1.2 
phpruntests/src/testcase/preconditions/rtHasNoDuplicateSections.php:1.3
--- phpruntests/src/testcase/preconditions/rtHasNoDuplicateSections.php:1.2 
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/preconditions/rtHasNoDuplicateSections.php Mon May 
25 12:00:11 2009
@@ -1,6 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtHasNoDuplicateSections implements rtTestPreCondition
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php?r1=1.9&r2=1.10&diff_format=u
Index: phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php
diff -u phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.9 
phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.10
--- phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php:1.9   
Fri May 15 09:58:21 2009
+++ phpruntests/src/testcase/preconditions/rtIsSectionImplemented.php   Mon May 
25 12:00:11 2009
@@ -1,6 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtIsSectionImplemented implements rtTestPreCondition
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/preconditions/rtHasMandatorySections.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/preconditions/rtHasMandatorySections.php
diff -u phpruntests/src/testcase/preconditions/rtHasMandatorySections.php:1.2 
phpruntests/src/testcase/preconditions/rtHasMandatorySections.php:1.3
--- phpruntests/src/testcase/preconditions/rtHasMandatorySections.php:1.2   
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/preconditions/rtHasMandatorySections.php   Mon May 
25 12:00:11 2009
@@ -1,6 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtHasMandatorySections implements rtTestPreCondition
 {



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

[PHP-CVS] cvs: phpruntests /src/testcase/output rtTestOutputWriterList.php rtTestOutputWriterXML.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 11:59:58 2009 UTC

  Modified files:  
/phpruntests/src/testcase/outputrtTestOutputWriterList.php 
rtTestOutputWriterXML.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/output/rtTestOutputWriterList.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/output/rtTestOutputWriterList.php
diff -u phpruntests/src/testcase/output/rtTestOutputWriterList.php:1.2 
phpruntests/src/testcase/output/rtTestOutputWriterList.php:1.3
--- phpruntests/src/testcase/output/rtTestOutputWriterList.php:1.2  Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/testcase/output/rtTestOutputWriterList.php  Mon May 25 
11:59:58 2009
@@ -1,6 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtTestOutputWriterList extends rtTestOutputWriter
 {
@@ -23,8 +34,6 @@
 $outputString = "";
 $testStatus = $testResult->getStatus();
 ksort($testStatus);
-//Status can be PASS and WARN or FAIL and WARN. I think these are 
the olny two combinations 
-//but there may be more
 foreach ($testStatus as $status => $message) {
 $outputString .= strtoupper($status);
 $outputString .= " " . $message;
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/output/rtTestOutputWriterXML.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/output/rtTestOutputWriterXML.php
diff -u phpruntests/src/testcase/output/rtTestOutputWriterXML.php:1.2 
phpruntests/src/testcase/output/rtTestOutputWriterXML.php:1.3
--- phpruntests/src/testcase/output/rtTestOutputWriterXML.php:1.2   Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/testcase/output/rtTestOutputWriterXML.php   Mon May 25 
11:59:58 2009
@@ -1,6 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtTestOutputWriterXML extends rtTestOutputWriter
 {



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

[PHP-CVS] cvs: php-src /ext/zlib/tests bug.tar bug_40189_2.phpt

2009-05-25 Thread Rasmus Lerdorf 
rasmus  Mon May 25 11:59:03 2009 UTC

  Removed files:   
/php-src/ext/zlib/tests bug.tar bug_40189_2.phpt 
  Log:
  Removing test
  
  



-- 
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/zlib/tests bug.tar bug_40189_2.phpt

2009-05-25 Thread Rasmus Lerdorf 
rasmus  Mon May 25 11:58:27 2009 UTC

  Removed files:   (Branch: PHP_5_3)
/php-src/ext/zlib/tests bug.tar bug_40189_2.phpt 
  Log:
  Removing test
  
  



-- 
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/zlib/tests bug.tar bug_40189_2.phpt

2009-05-25 Thread Rasmus Lerdorf 
rasmus  Mon May 25 11:57:25 2009 UTC

  Removed files:   (Branch: PHP_5_2)
/php-src/ext/zlib/tests bug.tar bug_40189_2.phpt 
  Log:
  Argh!  Please do not include entire GPL'ed packages in the PHP
  distribution.  Removing test and entire phpMyAdmin distribution
  in bug.tar.  
  
  



-- 
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/gmp config.w32

2009-05-25 Thread Pierre-Alain Joye 
pajoye  Mon May 25 10:15:19 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/gmpconfig.w32 
  Log:
  - MFH: enable MPIR support and the good old 4.1.x gmp for VC6. solving the 
lgplv3 mess
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/config.w32?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/gmp/config.w32
diff -u php-src/ext/gmp/config.w32:1.1 php-src/ext/gmp/config.w32:1.1.6.1
--- php-src/ext/gmp/config.w32:1.1  Tue Jan  4 22:39:29 2005
+++ php-src/ext/gmp/config.w32  Mon May 25 10:15:19 2009
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.1 2005/01/04 22:39:29 fmk Exp $
+// $Id: config.w32,v 1.1.6.1 2009/05/25 10:15:19 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("gmp", "Include GNU MP support.", "no");
 
 if (PHP_GMP != "no") {
-   if (CHECK_LIB("libgmp_a.lib", "gmp", PHP_GMP) &&
+   if (CHECK_LIB("mpir_a.lib;libgmp.lib", "gmp", PHP_GMP) &&
CHECK_HEADER_ADD_INCLUDE("gmp.h", "CFLAGS_GMP", PHP_GMP)) {
EXTENSION("gmp", "gmp.c");
AC_DEFINE('HAVE_GMP', 1, 'GMP support');



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

[PHP-CVS] cvs: php-src /ext/gmp config.w32

2009-05-25 Thread Pierre-Alain Joye 
pajoye  Mon May 25 10:14:36 2009 UTC

  Modified files:  
/php-src/ext/gmpconfig.w32 
  Log:
  - enable MPIR support and the good old 4.1.x gmp for VC6. solving the lgplv3 
mess
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/config.w32?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/gmp/config.w32
diff -u php-src/ext/gmp/config.w32:1.1 php-src/ext/gmp/config.w32:1.2
--- php-src/ext/gmp/config.w32:1.1  Tue Jan  4 22:39:29 2005
+++ php-src/ext/gmp/config.w32  Mon May 25 10:14:36 2009
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.1 2005/01/04 22:39:29 fmk Exp $
+// $Id: config.w32,v 1.2 2009/05/25 10:14:36 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("gmp", "Include GNU MP support.", "no");
 
 if (PHP_GMP != "no") {
-   if (CHECK_LIB("libgmp_a.lib", "gmp", PHP_GMP) &&
+   if (CHECK_LIB("mpir_a.lib;libgmp.lib", "gmp", PHP_GMP) &&
CHECK_HEADER_ADD_INCLUDE("gmp.h", "CFLAGS_GMP", PHP_GMP)) {
EXTENSION("gmp", "gmp.c");
AC_DEFINE('HAVE_GMP', 1, 'GMP support');



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

[PHP-CVS] cvs: phpruntests /src/configuration rtAddToCommandLine.php rtCommandLineOptions.php rtEnvironmentVariables.php rtIniAsCommandLineArgs.php rtPreCondition.php rtPreConditionList.php rtRuntests

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 08:56:23 2009 UTC

  Modified files:  
/phpruntests/src/configuration  rtAddToCommandLine.php rtSetting.php 
rtRuntestsConfiguration.php 
rtEnvironmentVariables.php 
rtPreConditionList.php 
rtIniAsCommandLineArgs.php 
rtPreCondition.php 
rtCommandLineOptions.php 
  Log:
  doc blocks
  http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtAddToCommandLine.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/rtAddToCommandLine.php
diff -u phpruntests/src/configuration/rtAddToCommandLine.php:1.2 
phpruntests/src/configuration/rtAddToCommandLine.php:1.3
--- phpruntests/src/configuration/rtAddToCommandLine.php:1.2Mon Apr 20 
20:24:30 2009
+++ phpruntests/src/configuration/rtAddToCommandLine.phpMon May 25 
08:56:23 2009
@@ -1,9 +1,18 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtAddToCommandLine
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtSetting.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/src/configuration/rtSetting.php
diff -u phpruntests/src/configuration/rtSetting.php:1.4 
phpruntests/src/configuration/rtSetting.php:1.5
--- phpruntests/src/configuration/rtSetting.php:1.4 Tue May 12 09:15:19 2009
+++ phpruntests/src/configuration/rtSetting.php Mon May 25 08:56:23 2009
@@ -1,12 +1,20 @@
 
+ * @authorStefan Priebsch 
+ * @copyright 2009 The PHP Group
+ * @license   http://www.php.net/license/3_01.txt PHP License 3.01
+ * @link  http://qa.php.net/
  */
 abstract class rtSetting
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtRuntestsConfiguration.php?r1=1.10&r2=1.11&diff_format=u
Index: phpruntests/src/configuration/rtRuntestsConfiguration.php
diff -u phpruntests/src/configuration/rtRuntestsConfiguration.php:1.10 
phpruntests/src/configuration/rtRuntestsConfiguration.php:1.11
--- phpruntests/src/configuration/rtRuntestsConfiguration.php:1.10  Sun May 
17 13:58:50 2009
+++ phpruntests/src/configuration/rtRuntestsConfiguration.php   Mon May 25 
08:56:23 2009
@@ -1,23 +1,12 @@
 
- * @authorStefan Priebsch 
- * @copyright 2009 The PHP Group
- * @license   http://www.php.net/license/3_01.txt PHP License 3.01
- * @link  http://qa.php.net/
- */
-
-/**
+ * 
  * Sets up the configuration for the whole test run
  *
  * Settings are derived from command line options and/or environment variables.
- * Runtests also overrides a number of ini settings.
+ * Runtests also overrides a number of ini settings. 
  * 
- *
  * @category  Testing
  * @package   RUNTESTS
  * @authorZoe Slattery 
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtEnvironmentVariables.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/src/configuration/rtEnvironmentVariables.php
diff -u phpruntests/src/configuration/rtEnvironmentVariables.php:1.4 
phpruntests/src/configuration/rtEnvironmentVariables.php:1.5
--- phpruntests/src/configuration/rtEnvironmentVariables.php:1.4Sun May 
17 13:58:50 2009
+++ phpruntests/src/configuration/rtEnvironmentVariables.phpMon May 25 
08:56:23 2009
@@ -1,9 +1,18 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtEnvironmentVariables
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtPreConditionList.php?r1=1.5&r2=1.6&diff_format=u
Index: phpruntests/src/configuration/rtPreConditionList.php
diff -u phpruntests/src/configuration/rtPreConditionList.php:1.5 
phpruntests/src/configuration/rtPreConditionList.php:1.6
--- phpruntests/src/configuration/rtPreConditionList.php:1.5Wed May 13 
11:10:54 2009
+++ phpruntests/src/configuration/rtPreConditionList.phpMon May 25 
08:56:23 2009
@@ -1,9 +1,18 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 abstract class rtPreConditionList
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtIniAsCommandLineArgs.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/configuration/rtIniAsCommandLineArgs.php
diff -u phpruntests/src/configuration/rtIniAsCommandLineArgs.php:1.3 
phpruntests/src/configuration/rtIniAsCommandLineArgs.php:1.4
--- phpruntests/src/configuration/rtIniAsCommandLineArgs.php:1.3Fri Apr 
24 08:41:25 2009
+++ phpruntests/src/configuration/rtIniAsCommandLineArgs.phpMon May 25 
08:56:23 2009
@@ -1,5 +1,18 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @license

[PHP-CVS] cvs: phpruntests /src/configuration/windows rtWinConfiguration.php rtWinEnvironmentVariables.php rtWinPreConditionList.php rtWinSettingList.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 08:46:27 2009 UTC

  Modified files:  
/phpruntests/src/configuration/windows  rtWinConfiguration.php 
rtWinEnvironmentVariables.php 
rtWinPreConditionList.php 
rtWinSettingList.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/windows/rtWinConfiguration.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/windows/rtWinConfiguration.php
diff -u phpruntests/src/configuration/windows/rtWinConfiguration.php:1.2 
phpruntests/src/configuration/windows/rtWinConfiguration.php:1.3
--- phpruntests/src/configuration/windows/rtWinConfiguration.php:1.2Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/configuration/windows/rtWinConfiguration.phpMon May 
25 08:46:27 2009
@@ -1,7 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtWinConfiguration extends rtRuntestsConfiguration
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/windows/rtWinEnvironmentVariables.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/windows/rtWinEnvironmentVariables.php
diff -u phpruntests/src/configuration/windows/rtWinEnvironmentVariables.php:1.2 
phpruntests/src/configuration/windows/rtWinEnvironmentVariables.php:1.3
--- phpruntests/src/configuration/windows/rtWinEnvironmentVariables.php:1.2 
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/configuration/windows/rtWinEnvironmentVariables.php Mon May 
25 08:46:27 2009
@@ -1,7 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtWinEnvironmentVariables extends rtEnvironmentVariables
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/windows/rtWinPreConditionList.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/windows/rtWinPreConditionList.php
diff -u phpruntests/src/configuration/windows/rtWinPreConditionList.php:1.2 
phpruntests/src/configuration/windows/rtWinPreConditionList.php:1.3
--- phpruntests/src/configuration/windows/rtWinPreConditionList.php:1.2 Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/configuration/windows/rtWinPreConditionList.php Mon May 
25 08:46:27 2009
@@ -1,7 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtWinPreConditionList extends rtPreconditionList
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/windows/rtWinSettingList.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/windows/rtWinSettingList.php
diff -u phpruntests/src/configuration/windows/rtWinSettingList.php:1.2 
phpruntests/src/configuration/windows/rtWinSettingList.php:1.3
--- phpruntests/src/configuration/windows/rtWinSettingList.php:1.2  Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/configuration/windows/rtWinSettingList.php  Mon May 25 
08:46:27 2009
@@ -1,7 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtWinSettingList extends rtSettingList
 {



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

[PHP-CVS] cvs: phpruntests /src/configuration/unix rtUnixConfiguration.php rtUnixEnvironmentVariables.php rtUnixPreConditionList.php rtUnixSettingList.php

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 08:42:30 2009 UTC

  Modified files:  
/phpruntests/src/configuration/unix rtUnixConfiguration.php 
rtUnixSettingList.php 
rtUnixEnvironmentVariables.php 
rtUnixPreConditionList.php 
  Log:
  doc blocks
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/unix/rtUnixConfiguration.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/unix/rtUnixConfiguration.php
diff -u phpruntests/src/configuration/unix/rtUnixConfiguration.php:1.2 
phpruntests/src/configuration/unix/rtUnixConfiguration.php:1.3
--- phpruntests/src/configuration/unix/rtUnixConfiguration.php:1.2  Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/configuration/unix/rtUnixConfiguration.php  Mon May 25 
08:42:30 2009
@@ -1,7 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtUnixConfiguration extends rtRuntestsConfiguration
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/unix/rtUnixSettingList.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/unix/rtUnixSettingList.php
diff -u phpruntests/src/configuration/unix/rtUnixSettingList.php:1.2 
phpruntests/src/configuration/unix/rtUnixSettingList.php:1.3
--- phpruntests/src/configuration/unix/rtUnixSettingList.php:1.2Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/configuration/unix/rtUnixSettingList.phpMon May 25 
08:42:30 2009
@@ -1,7 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtUnixSettingList extends rtSettingList
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/unix/rtUnixEnvironmentVariables.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/unix/rtUnixEnvironmentVariables.php
diff -u phpruntests/src/configuration/unix/rtUnixEnvironmentVariables.php:1.2 
phpruntests/src/configuration/unix/rtUnixEnvironmentVariables.php:1.3
--- phpruntests/src/configuration/unix/rtUnixEnvironmentVariables.php:1.2   
Fri Apr 24 08:41:26 2009
+++ phpruntests/src/configuration/unix/rtUnixEnvironmentVariables.php   Mon May 
25 08:42:30 2009
@@ -1,12 +1,22 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtUnixEnvironmentVariables extends rtEnvironmentVariables
 {
 /**
- * Adapts the global environment to Unix
+ * Adapts the environment to Unix
  *
  */
 public function adaptEnvironment()
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/unix/rtUnixPreConditionList.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/unix/rtUnixPreConditionList.php
diff -u phpruntests/src/configuration/unix/rtUnixPreConditionList.php:1.2 
phpruntests/src/configuration/unix/rtUnixPreConditionList.php:1.3
--- phpruntests/src/configuration/unix/rtUnixPreConditionList.php:1.2   Fri Apr 
24 08:41:26 2009
+++ phpruntests/src/configuration/unix/rtUnixPreConditionList.php   Mon May 
25 08:42:30 2009
@@ -1,7 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtUnixPreConditionList extends rtPreconditionList
 {



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

[PHP-CVS] cvs: phpruntests /src/configuration/settings rtCurrentDirectorySetting.php rtLogFormatSetting.php rtPhpCgiExecutableSetting.php rtPhpCommandLineArgSetting.php rtPhpExecutableSetting.php rtTe

2009-05-25 Thread Zoe Slattery 
zoe Mon May 25 08:36:59 2009 UTC

  Modified files:  
/phpruntests/src/configuration/settings rtTestFileSetting.php 
rtPhpExecutableSetting.php 
rtWorkingDirectorySetting.php 
rtPhpCommandLineArgSetting.php 
rtTestDirectorySetting.php 
rtPhpCgiExecutableSetting.php 
rtLogFormatSetting.php 
rtCurrentDirectorySetting.php 
  Log:
  doc blocs
  http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtTestFileSetting.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/configuration/settings/rtTestFileSetting.php
diff -u phpruntests/src/configuration/settings/rtTestFileSetting.php:1.3 
phpruntests/src/configuration/settings/rtTestFileSetting.php:1.4
--- phpruntests/src/configuration/settings/rtTestFileSetting.php:1.3Fri Apr 
24 08:41:25 2009
+++ phpruntests/src/configuration/settings/rtTestFileSetting.phpMon May 
25 08:36:59 2009
@@ -1,9 +1,19 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtTestFileSetting extends rtSetting
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtPhpExecutableSetting.php?r1=1.5&r2=1.6&diff_format=u
Index: phpruntests/src/configuration/settings/rtPhpExecutableSetting.php
diff -u phpruntests/src/configuration/settings/rtPhpExecutableSetting.php:1.5 
phpruntests/src/configuration/settings/rtPhpExecutableSetting.php:1.6
--- phpruntests/src/configuration/settings/rtPhpExecutableSetting.php:1.5   
Tue May 12 09:15:19 2009
+++ phpruntests/src/configuration/settings/rtPhpExecutableSetting.php   Mon May 
25 08:36:59 2009
@@ -1,8 +1,17 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtPhpExecutableSetting extends rtSetting
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtWorkingDirectorySetting.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/configuration/settings/rtWorkingDirectorySetting.php
diff -u 
phpruntests/src/configuration/settings/rtWorkingDirectorySetting.php:1.3 
phpruntests/src/configuration/settings/rtWorkingDirectorySetting.php:1.4
--- phpruntests/src/configuration/settings/rtWorkingDirectorySetting.php:1.3
Fri Apr 24 08:41:25 2009
+++ phpruntests/src/configuration/settings/rtWorkingDirectorySetting.php
Mon May 25 08:36:59 2009
@@ -1,9 +1,18 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtWorkingDirectorySetting extends rtSetting
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtPhpCommandLineArgSetting.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/configuration/settings/rtPhpCommandLineArgSetting.php
diff -u 
phpruntests/src/configuration/settings/rtPhpCommandLineArgSetting.php:1.3 
phpruntests/src/configuration/settings/rtPhpCommandLineArgSetting.php:1.4
--- phpruntests/src/configuration/settings/rtPhpCommandLineArgSetting.php:1.3   
Fri Apr 24 08:41:25 2009
+++ phpruntests/src/configuration/settings/rtPhpCommandLineArgSetting.php   
Mon May 25 08:36:59 2009
@@ -1,9 +1,18 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtPhpCommandLineArgSetting extends rtSetting
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtTestDirectorySetting.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/configuration/settings/rtTestDirectorySetting.php
diff -u phpruntests/src/configuration/settings/rtTestDirectorySetting.php:1.3 
phpruntests/src/configuration/settings/rtTestDirectorySetting.php:1.4
--- phpruntests/src/configuration/settings/rtTestDirectorySetting.php:1.3   
Fri Apr 24 08:41:25 2009
+++ phpruntests/src/configuration/settings/rtTestDirectorySetting.php   Mon May 
25 08:36:59 2009
@@ -1,9 +1,19 @@
 
+ * @author Stefan Priebsch 
+ * @copyright  2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
+ * @link   http://qa.php.net/
+ * 
  */
 class rtTestDirectorySetting extends rtSetting
 {
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php?r1=1.9&r2=1.10&diff_format=u
Index: phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php
diff -u 
phpruntests/src/configuration/settings/r