[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array array_count_values_variation.phpt
janiSun Apr 26 01:20:03 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array array_count_values_variation.phpt
Log:
- Fix test cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_count_values_variation.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_count_values_variation.phpt
diff -u
php-src/ext/standard/tests/array/array_count_values_variation.phpt:1.1.4.2
php-src/ext/standard/tests/array/array_count_values_variation.phpt:1.1.4.3
--- php-src/ext/standard/tests/array/array_count_values_variation.phpt:1.1.4.2
Tue Dec 2 13:37:20 2008
+++ php-src/ext/standard/tests/array/array_count_values_variation.phpt Sun Apr
26 01:20:03 2009
@@ -22,17 +22,19 @@
$ob = new A();
-$fp = fopen("array_count_file", "w+");
+$fp = fopen(dirname(__FILE__) . "/array_count_file", "w+");
$arrays = array ("bobk" => "bobv", "val", 6 => "val6", $fp, $ob);
var_dump (@array_count_values ($arrays));
-echo "\n";
-
-echo "Done";
+fclose($fp);
+echo "\nDone\n";
+?>
+--CLEAN--
+
-
--EXPECTF--
*** Testing array_count_values() : parameter variations ***
array(3) {
@@ -44,4 +46,4 @@
int(1)
}
-Done
\ No newline at end of file
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c
lbarnaudSat Apr 25 21:54:40 2009 UTC
Modified files:
/php-src/ext/splphp_spl.c
Log:
Fix memleak
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.154&r2=1.155&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.154 php-src/ext/spl/php_spl.c:1.155
--- php-src/ext/spl/php_spl.c:1.154 Sat Apr 25 21:05:00 2009
+++ php-src/ext/spl/php_spl.c Sat Apr 25 21:54:39 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.154 2009/04/25 21:05:00 lbarnaud Exp $ */
+/* $Id: php_spl.c,v 1.155 2009/04/25 21:54:39 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -315,17 +315,10 @@
* The "scope" is determined by an opcode, if it is
ZEND_FETCH_CLASS we know function was called indirectly by
* the Zend engine.
*/
-
- char *sclass_name;
- int sclass_name_len;
-
-
zend_unicode_to_string(ZEND_U_CONVERTER(UG(output_encoding_conv)),
&sclass_name, &sclass_name_len,
- class_name.u, class_name_len);
-
if (active_opline->opcode != ZEND_FETCH_CLASS) {
- zend_throw_exception_ex(spl_ce_LogicException, 0
TSRMLS_CC, "Class %s could not be loaded", sclass_name);
+ zend_throw_exception_ex(spl_ce_LogicException, 0
TSRMLS_CC, "Class %v could not be loaded", class_name.u);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s
could not be loaded", sclass_name);
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %v
could not be loaded", class_name.u);
}
}
} /* }}} */
--
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_sqlite/tests bug46542.phpt
janiSat Apr 25 21:44:33 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite/tests bug46542.phpt
Log:
MFH: Fix cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug46542.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/bug46542.phpt
diff -u php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.1.2.4
php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.1.2.5
--- php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.1.2.4 Sat Apr 25 21:38:04 2009
+++ php-src/ext/pdo_sqlite/tests/bug46542.phpt Sat Apr 25 21:44:33 2009
@@ -9,12 +9,16 @@
class A extends PDO
{ function __call($m, $p) {print __CLASS__."::$m\n";} }
-$a = new A('sqlite:' . __DIR__ . 'dummy.db');
+$a = new A('sqlite:' . __DIR__ . '/dummy.db');
$a->truc();
$a->TRUC();
?>
+--CLEAN--
+
--EXPECT--
A::truc
A::TRUC
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite/tests bug46542.phpt
janiSat Apr 25 21:44:20 2009 UTC
Modified files:
/php-src/ext/pdo_sqlite/tests bug46542.phpt
Log:
- Fix cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug46542.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/bug46542.phpt
diff -u php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.2
php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.3
--- php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.2 Fri Feb 20 13:37:48 2009
+++ php-src/ext/pdo_sqlite/tests/bug46542.phpt Sat Apr 25 21:44:20 2009
@@ -9,12 +9,16 @@
class A extends PDO
{ function __call($m, $p) {print __CLASS__."::$m\n";} }
-$a = new A('sqlite:dummy.db');
+$a = new A('sqlite:' . __DIR__ . '/dummy.db');
$a->truc();
$a->TRUC();
?>
+--CLEAN--
+
--EXPECT--
A::truc
A::TRUC
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite/tests bug43831.phpt pdo_sqlite_createaggregate.phpt pdo_sqlite_createfunction.phpt pdo_sqlite_lastinsertid.phpt pdo_sqlite_transaction.phpt
janiSat Apr 25 21:39:38 2009 UTC Modified files: /php-src/ext/pdo_sqlite/tests bug43831.phpt pdo_sqlite_createaggregate.phpt pdo_sqlite_createfunction.phpt pdo_sqlite_lastinsertid.phpt pdo_sqlite_transaction.phpt Log: - Added missing SKIPIF http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug43831.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/pdo_sqlite/tests/bug43831.phpt diff -u php-src/ext/pdo_sqlite/tests/bug43831.phpt:1.1 php-src/ext/pdo_sqlite/tests/bug43831.phpt:1.2 --- php-src/ext/pdo_sqlite/tests/bug43831.phpt:1.1 Fri Feb 13 02:20:31 2009 +++ php-src/ext/pdo_sqlite/tests/bug43831.phpt Sat Apr 25 21:39:37 2009 @@ -1,5 +1,7 @@ --TEST-- Bug #43831 ($this gets mangled when extending PDO with persistent connection) +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt:1.2 php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt:1.3 --- php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt:1.2Wed Dec 3 11:00:19 2008 +++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phptSat Apr 25 21:39:37 2009 @@ -1,5 +1,7 @@ --TEST-- PDO_sqlite: Testing sqliteCreateAggregate() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt:1.2 php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt:1.3 --- php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt:1.2 Wed Dec 3 11:00:19 2008 +++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt Sat Apr 25 21:39:37 2009 @@ -1,5 +1,7 @@ --TEST-- PDO_sqlite: Testing sqliteCreateFunction() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt:1.3 php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt:1.4 --- php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt:1.3 Mon Mar 23 23:03:08 2009 +++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt Sat Apr 25 21:39:37 2009 @@ -1,5 +1,7 @@ --TEST-- PDO_sqlite: Testing lastInsertId() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt:1.2 php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt:1.3 --- php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt:1.2Wed Dec 3 11:00:19 2008 +++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phptSat Apr 25 21:39:37 2009 @@ -1,5 +1,7 @@ --TEST-- PDO_sqlite: Testing transaction +--SKIPIF-- + --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_sqlite/tests bug43831.phpt bug46542.phpt pdo_sqlite_createaggregate.phpt pdo_sqlite_createfunction.phpt pdo_sqlite_lastinsertid.phpt pdo_sqlite_transaction.php
janiSat Apr 25 21:38:04 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite/tests bug43831.phpt bug46542.phpt
pdo_sqlite_createaggregate.phpt
pdo_sqlite_createfunction.phpt
pdo_sqlite_lastinsertid.phpt
pdo_sqlite_transaction.phpt
Log:
MFB: Added missing SKIPIF
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug43831.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/bug43831.phpt
diff -u php-src/ext/pdo_sqlite/tests/bug43831.phpt:1.1.2.2
php-src/ext/pdo_sqlite/tests/bug43831.phpt:1.1.2.3
--- php-src/ext/pdo_sqlite/tests/bug43831.phpt:1.1.2.2 Fri Feb 13 02:20:52 2009
+++ php-src/ext/pdo_sqlite/tests/bug43831.phpt Sat Apr 25 21:38:04 2009
@@ -1,5 +1,7 @@
--TEST--
Bug #43831 ($this gets mangled when extending PDO with persistent connection)
+--SKIPIF--
+
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug46542.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/bug46542.phpt
diff -u php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.1.2.3
php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.1.2.4
--- php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.1.2.3 Fri Feb 20 13:39:14 2009
+++ php-src/ext/pdo_sqlite/tests/bug46542.phpt Sat Apr 25 21:38:04 2009
@@ -9,7 +9,7 @@
class A extends PDO
{ function __call($m, $p) {print __CLASS__."::$m\n";} }
-$a = new A('sqlite:dummy.db');
+$a = new A('sqlite:' . __DIR__ . 'dummy.db');
$a->truc();
$a->TRUC();
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt
diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt:1.1.2.3
php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt:1.1.2.4
--- php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt:1.1.2.3
Wed Dec 3 11:00:31 2008
+++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phptSat Apr
25 21:38:04 2009
@@ -1,5 +1,7 @@
--TEST--
PDO_sqlite: Testing sqliteCreateAggregate()
+--SKIPIF--
+
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt
diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt:1.1.2.3
php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt:1.1.2.4
--- php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt:1.1.2.3 Wed Dec
3 11:00:31 2008
+++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt Sat Apr 25
21:38:04 2009
@@ -1,5 +1,7 @@
--TEST--
PDO_sqlite: Testing sqliteCreateFunction()
+--SKIPIF--
+
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt
diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt:1.1.2.3
php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt:1.1.2.4
--- php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt:1.1.2.3 Wed Dec
3 11:00:31 2008
+++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt Sat Apr 25
21:38:04 2009
@@ -1,5 +1,7 @@
--TEST--
PDO_sqlite: Testing lastInsertId()
+--SKIPIF--
+
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt
diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt:1.1.2.3
php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt:1.1.2.4
--- php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt:1.1.2.3Wed Dec
3 11:00:31 2008
+++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phptSat Apr 25
21:38:04 2009
@@ -1,5 +1,7 @@
--TEST--
PDO_sqlite: Testing transaction
+--SKIPIF--
+
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_sqlite/tests pdo_sqlite_createaggregate.phpt pdo_sqlite_createfunction.phpt pdo_sqlite_lastinsertid.phpt pdo_sqlite_transaction.phpt
janiSat Apr 25 21:37:00 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo_sqlite/tests pdo_sqlite_createaggregate.phpt pdo_sqlite_createfunction.phpt pdo_sqlite_lastinsertid.phpt pdo_sqlite_transaction.phpt Log: - Missing skip section http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt:1.1.4.3 php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt:1.1.4.4 --- php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt:1.1.4.3 Tue Dec 2 23:06:52 2008 +++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phptSat Apr 25 21:37:00 2009 @@ -1,5 +1,7 @@ --TEST-- PDO_sqlite: Testing sqliteCreateAggregate() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt:1.1.4.3 php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt:1.1.4.4 --- php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt:1.1.4.3 Tue Dec 2 23:06:52 2008 +++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt Sat Apr 25 21:37:00 2009 @@ -1,5 +1,7 @@ --TEST-- PDO_sqlite: Testing sqliteCreateFunction() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt:1.1.4.3 php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt:1.1.4.4 --- php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt:1.1.4.3 Tue Dec 2 23:06:52 2008 +++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt Sat Apr 25 21:37:00 2009 @@ -1,5 +1,7 @@ --TEST-- PDO_sqlite: Testing lastInsertId() +--SKIPIF-- + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt diff -u php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt:1.1.4.2 php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt:1.1.4.3 --- php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt:1.1.4.2Tue Dec 2 21:02:44 2008 +++ php-src/ext/pdo_sqlite/tests/pdo_sqlite_transaction.phptSat Apr 25 21:37:00 2009 @@ -1,5 +1,7 @@ --TEST-- PDO_sqlite: Testing transaction +--SKIPIF-- + --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c
lbarnaudSat Apr 25 21:09:23 2009 UTC
Modified files:
/php-src/ext/standard url_scanner_ex.c
Log:
gen
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.111&r2=1.112&diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.111
php-src/ext/standard/url_scanner_ex.c:1.112
--- php-src/ext/standard/url_scanner_ex.c:1.111 Tue Mar 10 23:39:40 2009
+++ php-src/ext/standard/url_scanner_ex.c Sat Apr 25 21:09:23 2009
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Jul 21 16:04:35 2008 */
+/* Generated by re2c 0.13.5 on Sat Apr 25 23:08:58 2009 */
#line 1 "ext/standard/url_scanner_ex.re"
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: url_scanner_ex.c,v 1.111 2009/03/10 23:39:40 helly Exp $ */
+/* $Id: url_scanner_ex.c,v 1.112 2009/04/25 21:09:23 lbarnaud Exp $ */
#include "php.h"
@@ -993,7 +993,7 @@
size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
- *handled_output = url_adapt_ext(output, output_len, &len,
(zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0)
TSRMLS_CC);
+ *handled_output = url_adapt_ext(output, output_len, &len,
(zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT |
PHP_OUTPUT_HANDLER_FLUSH | PHP_OUTPUT_HANDLER_FINAL) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) < sizeof(size_t)) {
if (len > UINT_MAX)
len = UINT_MAX;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.re
lbarnaudSat Apr 25 21:08:54 2009 UTC Modified files: /php-src/ext/standard url_scanner_ex.re Log: Fix version http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.re?r1=1.84&r2=1.85&diff_format=u Index: php-src/ext/standard/url_scanner_ex.re diff -u php-src/ext/standard/url_scanner_ex.re:1.84 php-src/ext/standard/url_scanner_ex.re:1.85 --- php-src/ext/standard/url_scanner_ex.re:1.84 Sat Apr 25 21:07:07 2009 +++ php-src/ext/standard/url_scanner_ex.re Sat Apr 25 21:08:54 2009 @@ -1,6 +1,6 @@ /* +--+ - | PHP Version 5| + | PHP Version 6| +--+ | Copyright (c) 1997-2006 The PHP Group| +--+ @@ -16,7 +16,7 @@ +--+ */ -/* $Id: url_scanner_ex.re,v 1.84 2009/04/25 21:07:07 lbarnaud Exp $ */ +/* $Id: url_scanner_ex.re,v 1.85 2009/04/25 21:08:54 lbarnaud Exp $ */ #include "php.h" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.re
lbarnaudSat Apr 25 21:07:07 2009 UTC
Modified files:
/php-src/ext/standard url_scanner_ex.re
Log:
Handle HEAD output handler flags
(fixes ext/standard/tests/general_functions/bug44394.phpt)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.re?r1=1.83&r2=1.84&diff_format=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.83
php-src/ext/standard/url_scanner_ex.re:1.84
--- php-src/ext/standard/url_scanner_ex.re:1.83 Wed Mar 12 19:35:24 2008
+++ php-src/ext/standard/url_scanner_ex.re Sat Apr 25 21:07:07 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: url_scanner_ex.re,v 1.83 2008/03/12 19:35:24 felipe Exp $ */
+/* $Id: url_scanner_ex.re,v 1.84 2009/04/25 21:07:07 lbarnaud Exp $ */
#include "php.h"
@@ -431,7 +431,7 @@
size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
- *handled_output = url_adapt_ext(output, output_len, &len,
(zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0)
TSRMLS_CC);
+ *handled_output = url_adapt_ext(output, output_len, &len,
(zend_bool) (mode & (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT |
PHP_OUTPUT_HANDLER_FLUSH | PHP_OUTPUT_HANDLER_FINAL) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) < sizeof(size_t)) {
if (len > UINT_MAX)
len = UINT_MAX;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
lbarnaudSat Apr 25 21:06:01 2009 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Fix memleak in set_include_path()
(ext/standard/tests/file/file_put_contents_variation5.phpt)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.952&r2=1.953&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.952
php-src/ext/standard/basic_functions.c:1.953
--- php-src/ext/standard/basic_functions.c:1.952Thu Mar 26 20:02:28 2009
+++ php-src/ext/standard/basic_functions.c Sat Apr 25 21:06:01 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.952 2009/03/26 20:02:28 felipe Exp $ */
+/* $Id: basic_functions.c,v 1.953 2009/04/25 21:06:01 lbarnaud Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -5499,7 +5499,7 @@
if (zend_alter_ini_entry_ex("include_path", sizeof("include_path"),
new_value.s, new_value_len, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC)
== FAILURE) {
zval_dtor(return_value);
- RETURN_FALSE;
+ RETVAL_FALSE;
}
if (free_new_value) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c
lbarnaudSat Apr 25 21:05:00 2009 UTC
Modified files:
/php-src/ext/splphp_spl.c
Log:
MFB5.3 (Fixed bug #38325 (spl_autoload_register() gaves wrong line for
"class not found"))
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.153&r2=1.154&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.153 php-src/ext/spl/php_spl.c:1.154
--- php-src/ext/spl/php_spl.c:1.153 Mon Apr 20 14:18:46 2009
+++ php-src/ext/spl/php_spl.c Sat Apr 25 21:05:00 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.153 2009/04/20 14:18:46 colder Exp $ */
+/* $Id: php_spl.c,v 1.154 2009/04/25 21:05:00 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -311,7 +311,22 @@
EG(active_op_array) = original_active_op_array;
if (!found && !SPL_G(autoload_running)) {
- zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC,
"Class %v could not be loaded", class_name);
+ /* For internal errors, we generate E_ERROR, for direct calls
an exception is thrown.
+* The "scope" is determined by an opcode, if it is
ZEND_FETCH_CLASS we know function was called indirectly by
+* the Zend engine.
+*/
+
+ char *sclass_name;
+ int sclass_name_len;
+
+
zend_unicode_to_string(ZEND_U_CONVERTER(UG(output_encoding_conv)),
&sclass_name, &sclass_name_len,
+ class_name.u, class_name_len);
+
+ if (active_opline->opcode != ZEND_FETCH_CLASS) {
+ zend_throw_exception_ex(spl_ce_LogicException, 0
TSRMLS_CC, "Class %s could not be loaded", sclass_name);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s
could not be loaded", sclass_name);
+ }
}
} /* }}} */
--
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/spl/tests spl_classes.phpt
sebsSat Apr 25 19:06:58 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/spl/tests spl_classes.phpt Log: Initial import http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_classes.phpt?view=markup&rev=1.1 Index: php-src/ext/spl/tests/spl_classes.phpt +++ php-src/ext/spl/tests/spl_classes.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests spl_classes.phpt
sebsSat Apr 25 19:06:26 2009 UTC
Modified files:
/php-src/ext/spl/tests spl_classes.phpt
Log:
Initial import
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_classes.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/spl/tests/spl_classes.phpt
diff -u /dev/null php-src/ext/spl/tests/spl_classes.phpt:1.2
--- /dev/null Sat Apr 25 19:06:26 2009
+++ php-src/ext/spl/tests/spl_classes.phpt Sat Apr 25 19:06:26 2009
@@ -0,0 +1,123 @@
+--TEST--
+SPL: spl_classes() function
+--CREDITS--
+Sebastian Schürmann
+s...@php.net
+Testfest 2009 Munich
+--FILE--
+
+--EXPECT--
+array(54) {
+ ["AppendIterator"]=>
+ string(14) "AppendIterator"
+ ["ArrayIterator"]=>
+ string(13) "ArrayIterator"
+ ["ArrayObject"]=>
+ string(11) "ArrayObject"
+ ["BadFunctionCallException"]=>
+ string(24) "BadFunctionCallException"
+ ["BadMethodCallException"]=>
+ string(22) "BadMethodCallException"
+ ["CachingIterator"]=>
+ string(15) "CachingIterator"
+ ["Countable"]=>
+ string(9) "Countable"
+ ["DirectoryIterator"]=>
+ string(17) "DirectoryIterator"
+ ["DomainException"]=>
+ string(15) "DomainException"
+ ["EmptyIterator"]=>
+ string(13) "EmptyIterator"
+ ["FilesystemIterator"]=>
+ string(18) "FilesystemIterator"
+ ["FilterIterator"]=>
+ string(14) "FilterIterator"
+ ["GlobIterator"]=>
+ string(12) "GlobIterator"
+ ["InfiniteIterator"]=>
+ string(16) "InfiniteIterator"
+ ["InvalidArgumentException"]=>
+ string(24) "InvalidArgumentException"
+ ["IteratorIterator"]=>
+ string(16) "IteratorIterator"
+ ["LengthException"]=>
+ string(15) "LengthException"
+ ["LimitIterator"]=>
+ string(13) "LimitIterator"
+ ["LogicException"]=>
+ string(14) "LogicException"
+ ["MultipleIterator"]=>
+ string(16) "MultipleIterator"
+ ["NoRewindIterator"]=>
+ string(16) "NoRewindIterator"
+ ["OuterIterator"]=>
+ string(13) "OuterIterator"
+ ["OutOfBoundsException"]=>
+ string(20) "OutOfBoundsException"
+ ["OutOfRangeException"]=>
+ string(19) "OutOfRangeException"
+ ["OverflowException"]=>
+ string(17) "OverflowException"
+ ["ParentIterator"]=>
+ string(14) "ParentIterator"
+ ["RangeException"]=>
+ string(14) "RangeException"
+ ["RecursiveArrayIterator"]=>
+ string(22) "RecursiveArrayIterator"
+ ["RecursiveCachingIterator"]=>
+ string(24) "RecursiveCachingIterator"
+ ["RecursiveDirectoryIterator"]=>
+ string(26) "RecursiveDirectoryIterator"
+ ["RecursiveFilterIterator"]=>
+ string(23) "RecursiveFilterIterator"
+ ["RecursiveIterator"]=>
+ string(17) "RecursiveIterator"
+ ["RecursiveIteratorIterator"]=>
+ string(25) "RecursiveIteratorIterator"
+ ["RecursiveRegexIterator"]=>
+ string(22) "RecursiveRegexIterator"
+ ["RecursiveTreeIterator"]=>
+ string(21) "RecursiveTreeIterator"
+ ["RegexIterator"]=>
+ string(13) "RegexIterator"
+ ["RuntimeException"]=>
+ string(16) "RuntimeException"
+ ["SeekableIterator"]=>
+ string(16) "SeekableIterator"
+ ["SplDoublyLinkedList"]=>
+ string(19) "SplDoublyLinkedList"
+ ["SplFileInfo"]=>
+ string(11) "SplFileInfo"
+ ["SplFileObject"]=>
+ string(13) "SplFileObject"
+ ["SplFixedArray"]=>
+ string(13) "SplFixedArray"
+ ["SplHeap"]=>
+ string(7) "SplHeap"
+ ["SplMinHeap"]=>
+ string(10) "SplMinHeap"
+ ["SplMaxHeap"]=>
+ string(10) "SplMaxHeap"
+ ["SplObjectStorage"]=>
+ string(16) "SplObjectStorage"
+ ["SplObserver"]=>
+ string(11) "SplObserver"
+ ["SplPriorityQueue"]=>
+ string(16) "SplPriorityQueue"
+ ["SplQueue"]=>
+ string(8) "SplQueue"
+ ["SplStack"]=>
+ string(8) "SplStack"
+ ["SplSubject"]=>
+ string(10) "SplSubject"
+ ["SplTempFileObject"]=>
+ string(17) "SplTempFileObject"
+ ["UnderflowException"]=>
+ string(18) "UnderflowException"
+ ["UnexpectedValueException"]=>
+ string(24) "UnexpectedValueException"
+}
+
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions call_user_method.phpt
sebsSat Apr 25 19:00:42 2009 UTC Modified files: /php-src/ext/standard/tests/general_functions call_user_method.phpt Log: Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/call_user_method.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/call_user_method.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/call_user_method.phpt:1.2 --- /dev/null Sat Apr 25 19:00:42 2009 +++ php-src/ext/standard/tests/general_functions/call_user_method.phpt Sat Apr 25 19:00:42 2009 @@ -0,0 +1,20 @@ +--TEST-- +Basic behaviour of call_user_method() test +--CREDITS-- +Sebastian Schürmann +s...@php.net +Testfest 2009 Munich +--FILE-- + +--EXPECTF-- +Deprecated: Function call_user_method() is deprecated in %s on line 8 +bool(true) -- 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/standard/tests/general_functions call_user_method.phpt
sebsSat Apr 25 18:59:54 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions call_user_method.phpt Log: Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/call_user_method.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/call_user_method.phpt +++ php-src/ext/standard/tests/general_functions/call_user_method.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/func ini_alter.phpt
sebsSat Apr 25 18:51:52 2009 UTC Added files: (Branch: PHP_5_2) /php-src/tests/func ini_alter.phpt Log: Initial commit http://cvs.php.net/viewvc.cgi/php-src/tests/func/ini_alter.phpt?view=markup&rev=1.1 Index: php-src/tests/func/ini_alter.phpt +++ php-src/tests/func/ini_alter.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/func ini_alter.phpt
sebsSat Apr 25 18:50:52 2009 UTC Modified files: /php-src/tests/func ini_alter.phpt Log: Initial commit http://cvs.php.net/viewvc.cgi/php-src/tests/func/ini_alter.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/func/ini_alter.phpt diff -u /dev/null php-src/tests/func/ini_alter.phpt:1.2 --- /dev/null Sat Apr 25 18:50:52 2009 +++ php-src/tests/func/ini_alter.phpt Sat Apr 25 18:50:52 2009 @@ -0,0 +1,19 @@ +--TEST-- +ini_alter() check +--CREDITS-- +Sebastian Schürmann +s...@php.net +Testfest 2009 Munich +--FILE-- + +--EXPECT-- +string(1) "1" +string(1) "0" + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /tests/output ob_get_status.phpt
Hi Sebastian 2009/4/25 Sebastian Schürmann > > sebs Sat Apr 25 18:44:42 2009 UTC > > Added files: (Branch: PHP_5_2) > /php-src/tests/output ob_get_status.phpt > Log: > Initial commit > > > http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_get_status.phpt?view=markup&rev=1.1 > Index: php-src/tests/output/ob_get_status.phpt > +++ php-src/tests/output/ob_get_status.phpt You can just add multiple files instead of many commits with a single new file > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > regrads -- Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/output ob_get_status.phpt
sebsSat Apr 25 18:44:42 2009 UTC Added files: (Branch: PHP_5_2) /php-src/tests/output ob_get_status.phpt Log: Initial commit http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_get_status.phpt?view=markup&rev=1.1 Index: php-src/tests/output/ob_get_status.phpt +++ php-src/tests/output/ob_get_status.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/output ob_get_status.phpt
sebsSat Apr 25 18:42:13 2009 UTC
Modified files:
/php-src/tests/output ob_get_status.phpt
Log:
Initial commit
http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_get_status.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/output/ob_get_status.phpt
diff -u /dev/null php-src/tests/output/ob_get_status.phpt:1.2
--- /dev/null Sat Apr 25 18:42:13 2009
+++ php-src/tests/output/ob_get_status.phpt Sat Apr 25 18:42:13 2009
@@ -0,0 +1,34 @@
+--TEST--
+ob_get_status() function basic test
+--CREDITS--
+Sebastian Schürmann
+s...@php.net
+Testfest 2009 Munich
+--FILE--
+
+--EXPECT--
+array(1) {
+ [0]=>
+ array(7) {
+["chunk_size"]=>
+int(0)
+["size"]=>
+int(40960)
+["block_size"]=>
+int(10240)
+["type"]=>
+int(1)
+["status"]=>
+int(0)
+["name"]=>
+string(22) "default output handler"
+["del"]=>
+bool(true)
+ }
+}
+
--
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/standard/tests/strings strcoll.phpt
sebsSat Apr 25 18:36:05 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings strcoll.phpt Log: - Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strcoll.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/strcoll.phpt +++ php-src/ext/standard/tests/strings/strcoll.phpt -- 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/standard/tests/versioning php_sapi_name_variation001.phpt
sebsSat Apr 25 18:29:23 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/versioning php_sapi_name_variation001.phpt Log: Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt +++ php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/versioning php_sapi_name_variation001.phpt
sebsSat Apr 25 18:28:02 2009 UTC Modified files: /php-src/ext/standard/tests/versioning php_sapi_name_variation001.phpt Log: Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt diff -u /dev/null php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt:1.2 --- /dev/null Sat Apr 25 18:28:02 2009 +++ php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt Sat Apr 25 18:28:02 2009 @@ -0,0 +1,14 @@ +--TEST-- +php_sapi_name() function when switching to webserver by using post +--POST-- +foo=BAR +--CREDITS-- +Sebastian Schürmann +s...@php.net +Testfest 2009 Munich +--FILE-- + +--EXPECT-- +cgi-fcgi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/security .cvsignore
janiSat Apr 25 18:26:49 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/security .cvsignore Log: fix .cvsignore (Tony, it is not illegal to MFH to PHP_5_2..) http://cvs.php.net/viewvc.cgi/php-src/tests/security/.cvsignore?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/tests/security/.cvsignore diff -u php-src/tests/security/.cvsignore:1.1.4.2 php-src/tests/security/.cvsignore:1.1.4.3 --- php-src/tests/security/.cvsignore:1.1.4.2 Wed May 21 12:31:31 2008 +++ php-src/tests/security/.cvsignore Sat Apr 25 18:26:49 2009 @@ -4,5 +4,6 @@ *.log *.exp *.out +*.php *.gcda *.gcno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
AW: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/versioning php_sapi_name_variation001.phpt
Hello Thanks for the heads up. The answer is that i made a mistake not starting 6.0 and i am not yet finished. Ill change my way of work and go test by test adding to all branches. Dont mind hinting me about other tthings you see. ty Sebastian - Ursprüngliche Mail Von: Jani Taskinen An: Sebastian Schürmann ; php-cvs@lists.php.net Gesendet: Samstag, den 25. April 2009, 16:13:33 Uhr Betreff: Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/versioning php_sapi_name_variation001.phpt Sebastian Schürmann kirjoitti: > sebsSat Apr 25 11:33:26 2009 UTC > > Added files: (Branch: PHP_5_3) > /php-src/ext/standard/tests/versioning > php_sapi_name_variation001.phpt > Log: > - Initial commit > > http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt?view=markup&rev=1.1 > Index: php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt > +++ php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt > Why are you committing tests only to PHP_5_3 branch and not to HEAD / PHP_5_2 ? --Jani -- 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/standard/tests/directory DirectoryClass_basic_001.phpt
janiSat Apr 25 17:29:46 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/directory DirectoryClass_basic_001.phpt Log: - In PHP_5_2 it is still possible to disable reflection. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt diff -u php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt:1.1.4.2 php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt:1.1.4.3 --- php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt:1.1.4.2 Thu Nov 27 14:51:16 2008 +++ php-src/ext/standard/tests/directory/DirectoryClass_basic_001.phpt Sat Apr 25 17:29:46 2009 @@ -1,5 +1,7 @@ --TEST-- Directory class behaviour. +--SKIPIF-- + --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar/tests phpinfo_003.phpt
janiSat Apr 25 18:02:56 2009 UTC Modified files: /php-src/ext/phar/tests phpinfo_003.phpt Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_003.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/phar/tests/phpinfo_003.phpt diff -u php-src/ext/phar/tests/phpinfo_003.phpt:1.6 php-src/ext/phar/tests/phpinfo_003.phpt:1.7 --- php-src/ext/phar/tests/phpinfo_003.phpt:1.6 Fri Aug 1 13:36:18 2008 +++ php-src/ext/phar/tests/phpinfo_003.phpt Sat Apr 25 18:02:56 2009 @@ -35,7 +35,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik. Phar fully realized by Gregory Beaver and Marcus Boerger. -Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle. +Portions of tar implementation Copyright (c) 2003-200%d Tim Kientzle. Directive => Local Value => Master Value phar.cache_list => no value => no value phar.readonly => On => On -- 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/phar/tests/tar phar_convert_phar.phpt
janiSat Apr 25 17:57:36 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar/tests/tar phar_convert_phar.phpt Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_convert_phar.phpt?r1=1.9.2.2&r2=1.9.2.3&diff_format=u Index: php-src/ext/phar/tests/tar/phar_convert_phar.phpt diff -u php-src/ext/phar/tests/tar/phar_convert_phar.phpt:1.9.2.2 php-src/ext/phar/tests/tar/phar_convert_phar.phpt:1.9.2.3 --- php-src/ext/phar/tests/tar/phar_convert_phar.phpt:1.9.2.2 Sun May 18 20:52:34 2008 +++ php-src/ext/phar/tests/tar/phar_convert_phar.phpt Sat Apr 25 17:57:36 2009 @@ -9,7 +9,7 @@ http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar/tests/tar phar_convert_phar.phpt
janiSat Apr 25 17:57:27 2009 UTC Modified files: /php-src/ext/phar/tests/tar phar_convert_phar.phpt Log: - fix test cleanup (== consistent now :) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_convert_phar.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/phar/tests/tar/phar_convert_phar.phpt diff -u php-src/ext/phar/tests/tar/phar_convert_phar.phpt:1.11 php-src/ext/phar/tests/tar/phar_convert_phar.phpt:1.12 --- php-src/ext/phar/tests/tar/phar_convert_phar.phpt:1.11 Mon May 19 19:05:42 2008 +++ php-src/ext/phar/tests/tar/phar_convert_phar.phpt Sat Apr 25 17:57:27 2009 @@ -9,7 +9,7 @@ http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php
zoe Sat Apr 25 17:27:48 2009 UTC Modified files: /phpruntests/src/testcase rtTestConfiguration.php Log: updating doc block http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.3&r2=1.4&diff_format=u Index: phpruntests/src/testcase/rtTestConfiguration.php diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.3 phpruntests/src/testcase/rtTestConfiguration.php:1.4 --- phpruntests/src/testcase/rtTestConfiguration.php:1.3Sat Apr 25 15:04:23 2009 +++ phpruntests/src/testcase/rtTestConfiguration.phpSat Apr 25 17:27:48 2009 @@ -1,16 +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/ */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/configuration/settings rtPhpCgiExecutableSettingTest.php
zoe Sat Apr 25 17:18:37 2009 UTC
Modified files:
/phpruntests/tests/configuration/settings
rtPhpCgiExecutableSettingTest.php
Log:
Adding a way of deriving the cgi executable from the cli. Matches current
impl but will need win specific test
http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php?r1=1.2&r2=1.3&diff_format=u
Index:
phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
diff -u
phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php:1.2
phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php:1.3
---
phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php:1.2
Mon Apr 20 20:50:39 2009
+++ phpruntests/tests/configuration/settings/rtPhpCgiExecutableSettingTest.php
Sat Apr 25 17:18:37 2009
@@ -25,10 +25,18 @@
public function testSetPhpCgiExecutableNotSet() {
$configuration =
rtRuntestsConfiguration::getInstance(array('run-tests.php', 'test.phpt'));
-
+
$cgisetting = new rtPhpCgiExecutableSetting($configuration);
+
+$this->assertEquals(null, $cgisetting->get());
+}
+
+public function testSetFromCliExecutableName() {
-$this->assertEquals(null, $cgisetting->get());
+$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', '/a/sapi/cli/a-php-exe', 'test.phpt'));
+$config->configure();
+
+$this->assertEquals('/a/sapi/cgi/php',
$config->getSetting('PhpCgiExecutable'));
}
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/configuration/settings rtPhpCgiExecutableSetting.php
zoe Sat Apr 25 17:18:23 2009 UTC
Modified files:
/phpruntests/src/configuration/settings
rtPhpCgiExecutableSetting.php
Log:
Adding a way of deriving the cgi executable from the cli. Matches current
impl but will need win specific test
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php
diff -u
phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.3
phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.4
--- phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php:1.3
Fri Apr 24 08:41:25 2009
+++ phpruntests/src/configuration/settings/rtPhpCgiExecutableSetting.php
Sat Apr 25 17:18:23 2009
@@ -33,6 +33,18 @@
}
}
+/**
+ *
+ */
+public function setFromPhpCli($phpCli)
+{
+if(substr(dirname($phpCli),-3) == 'cli') {
+$pathLength = strlen(dirname($phpCli)) - 3;
+$sapiDir = substr(dirname($phpCli), 0, $pathLength);
+$this->phpCgiExecutable = $sapiDir."cgi/php";
+}
+}
+
/**
* Supply the setting to the configuration on request
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/configuration rtRuntestsConfiguration.php
zoe Sat Apr 25 17:18:13 2009 UTC
Modified files:
/phpruntests/src/configuration rtRuntestsConfiguration.php
Log:
Adding a way of deriving the cgi executable from the cli. Matches current
impl but will need win specific test
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtRuntestsConfiguration.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/configuration/rtRuntestsConfiguration.php
diff -u phpruntests/src/configuration/rtRuntestsConfiguration.php:1.3
phpruntests/src/configuration/rtRuntestsConfiguration.php:1.4
--- phpruntests/src/configuration/rtRuntestsConfiguration.php:1.3 Fri Apr
24 08:41:25 2009
+++ phpruntests/src/configuration/rtRuntestsConfiguration.php Sat Apr 25
17:18:13 2009
@@ -104,7 +104,13 @@
*
*/
private function setPhpCgiExecutable()
-{
+{
+//If the CGI executable hasn't been set using an environmental
variable or 'auto', try and derive it from
+//the name of the cli executable.
+//TODO This is *ix specific, need a WIN specific class
PhpCgiExecutable setting class
+if($this->setters['PhpCgiExecutable']->get() == null) {
+
$this->setters['PhpCgiExecutable']->setFromPhpCli($this->settings['PhpExecutable']);
+}
$this->settings['PhpCgiExecutable']=
$this->setters['PhpCgiExecutable']->get();
}
--
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/standard/tests/directory .cvsignore
janiSat Apr 25 17:16:59 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/directory .cvsignore Log: MFH: add .cvsignore file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/directory/.cvsignore?view=markup&rev=1.1 Index: php-src/ext/standard/tests/directory/.cvsignore +++ php-src/ext/standard/tests/directory/.cvsignore -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/output .cvsignore
janiSat Apr 25 17:15:38 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/output .cvsignore Log: - Added missing entry http://cvs.php.net/viewvc.cgi/php-src/tests/output/.cvsignore?r1=1.3.4.2&r2=1.3.4.3&diff_format=u Index: php-src/tests/output/.cvsignore diff -u php-src/tests/output/.cvsignore:1.3.4.2 php-src/tests/output/.cvsignore:1.3.4.3 --- php-src/tests/output/.cvsignore:1.3.4.2 Sat Jan 24 13:01:06 2009 +++ php-src/tests/output/.cvsignore Sat Apr 25 17:15:38 2009 @@ -4,5 +4,6 @@ *.log *.exp *.out +*.php *.gcda *.gcno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
janiSat Apr 25 17:12:56 2009 UTC
Modified files:
/php-srcrun-tests.php
Log:
MFB52: sync
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.395&r2=1.396&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.395 php-src/run-tests.php:1.396
--- php-src/run-tests.php:1.395 Thu Apr 16 13:40:47 2009
+++ php-src/run-tests.php Sat Apr 25 17:12:56 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.395 2009/04/16 13:40:47 bjori Exp $ */
+/* $Id: run-tests.php,v 1.396 2009/04/25 17:12:56 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -71,14 +71,15 @@
define("PHP_MAJOR_VERSION", $major);
}
-// __DIR__ and FILE_BINARY is available from 5.3.0
+// __DIR__ is available from 5.3.0
if (PHP_VERSION_ID < 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
- define('FILE_BINARY', 0);
+ // FILE_BINARY is available from 5.2.7
+ if (PHP_VERSION_ID < 50207) {
+ define('FILE_BINARY', 0);
+ }
}
-
-
// If timezone is not set, use UTC.
if (ini_get('date.timezone') == '') {
date_default_timezone_set('UTC');
@@ -632,7 +633,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.395 $' . "\n";
+ echo '$Revision: 1.396 $' . "\n";
exit(1);
default:
--
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) / run-tests.php
janiSat Apr 25 17:12:40 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFB52: sync
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.64&r2=1.226.2.37.2.35.2.65&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.64
php-src/run-tests.php:1.226.2.37.2.35.2.65
--- php-src/run-tests.php:1.226.2.37.2.35.2.64 Thu Apr 16 13:41:25 2009
+++ php-src/run-tests.php Sat Apr 25 17:12:40 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.64 2009/04/16 13:41:25 bjori Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.65 2009/04/25 17:12:40 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -71,14 +71,15 @@
define("PHP_MAJOR_VERSION", $major);
}
-// __DIR__ and FILE_BINARY is available from 5.3.0
+// __DIR__ is available from 5.3.0
if (PHP_VERSION_ID < 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
- define('FILE_BINARY', 0);
+ // FILE_BINARY is available from 5.2.7
+ if (PHP_VERSION_ID < 50207) {
+ define('FILE_BINARY', 0);
+ }
}
-
-
// If timezone is not set, use UTC.
if (ini_get('date.timezone') == '') {
date_default_timezone_set('UTC');
@@ -632,7 +633,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.64
$' . "\n";
+ echo '$Revision: 1.226.2.37.2.35.2.65
$' . "\n";
exit(1);
default:
--
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) / run-tests.php
janiSat Apr 25 17:12:12 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
MFH: Sync
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.62&r2=1.226.2.37.2.63&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.62
php-src/run-tests.php:1.226.2.37.2.63
--- php-src/run-tests.php:1.226.2.37.2.62 Sat Apr 25 16:54:50 2009
+++ php-src/run-tests.php Sat Apr 25 17:12:11 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.62 2009/04/25 16:54:50 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.63 2009/04/25 17:12:11 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -633,7 +633,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.62 $' .
"\n";
+ echo '$Revision: 1.226.2.37.2.63 $' .
"\n";
exit(1);
default:
@@ -1354,7 +1354,6 @@
if (is_array($IN_REDIRECT)) {
$tested = $IN_REDIRECT['prefix'] . ' ' .
trim($section_text['TEST']);
$tested_file = $tmp_relative_file;
- $section_text['FILE'] = "# original source file: $shortname\n"
. $section_text['FILE'];
}
// unlink old test results
@@ -1913,6 +1912,9 @@
// write .diff
$diff = generate_diff($wanted, $wanted_re, $output);
+ if (is_array($IN_REDIRECT)) {
+ $diff = "# original source file: $shortname\n" . $diff;
+ }
show_file_block('diff', $diff);
if (strpos($log_format, 'D') !== false &&
file_put_contents($diff_filename, (binary) $diff, FILE_BINARY) === false) {
error("Cannot create test diff - $diff_filename");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
k :)
On Sat, Apr 25, 2009 at 6:03 PM, Ilia Alshanetsky wrote:
> I'd prefer to avoid introducing new functionality into 5.2 at this point.
>
>
> Ilia Alshanetsky
>
>
>
>
> On 25-Apr-09, at 11:14 AM, Pierre Joye wrote:
>
>> hi Jani,
>>
>> Yes, I will MFH it as well.
>>
>> I also like to add mail_gc to 5.2 (coming to 5.3+) to allow one to
>> purge the cache while processing a large amount of mails (or large
>> mail) without having to call mail_close. But have to ask Ilia first :)
>>
>> Cheers,
>>
>> On Sat, Apr 25, 2009 at 5:11 PM, Jani Taskinen
>> wrote:
>>>
>>> Isn't this necessary in PHP_5_2? Sounds like a bug fix to me..
>>>
>>> --Jani
>>>
>>>
>>> Pierre-Alain Joye kirjoitti:
pajoye Sat Apr 25 15:02:36 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c Log:
- MFH: SEARCHPGM struct has to be freed
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.34&r2=1.208.2.7.2.26.2.35&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.35
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34 Sat Apr 25
14:59:21 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:02:36 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski
|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.34 2009/04/25 14:59:21 pajoye Exp
$
*/
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.35 2009/04/25 15:02:36 pajoye Exp
$
*/
#define IMAP41
@@ -3902,6 +3902,7 @@
char *search_criteria;
MESSAGELIST *cur;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "rs|ls", &streamind,
&criteria, &criteria_len, &flags, &charset, &charset_len) == FAILURE) {
return;
@@ -3912,7 +3913,14 @@
search_criteria = estrndup(criteria, criteria_len);
IMAPG(imap_messages) = IMAPG(imap_messages_tail) = NIL;
- mail_search_full(imap_le_struct->imap_stream, (argc == 4 ?
charset
: NIL), mail_criteria(search_criteria), flags);
+ pgm = mail_criteria(search_criteria);
+
+ mail_search_full(imap_le_struct->imap_stream, (argc == 4 ?
charset
: NIL), pgm, flags);
+
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
+
if (IMAPG(imap_messages) == NIL) {
efree(search_criteria);
RETURN_FALSE;
@@ -4518,6 +4526,7 @@
char criteria[] = "ALL";
THREADNODE *top;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind,
&flags) == FAILURE) {
return;
@@ -4525,7 +4534,11 @@
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1,
"imap",
le_imap);
- top = mail_thread(imap_le_struct->imap_stream, "REFERENCES",
NIL,
mail_criteria(criteria), flags);
+ pgm = mail_criteria(criteria);
+ top = mail_thread(imap_le_struct->imap_stream, "REFERENCES",
NIL,
pgm, flags);
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
if(top == NIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function
returned an empty tree");
>>>
>>>
>>> --
>>> PHP CVS Mailing List (http://www.php.net/)
>>> To unsubscribe, visit: http://www.php.net/unsub.php
>>>
>>>
>>
>>
>>
>> --
>> Pierre
>>
>> http://blog.thepimp.net | http://www.libgd.org
>>
>> --
>> PHP CVS Mailing List (http://www.php.net/)
>> To unsubscribe, visit: http://www.php.net/unsub.php
>>
>
>
--
Pierre
http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php
janiSat Apr 25 16:54:50 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
- Fix bad check (Hannes, please test stuff you commit..)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.61&r2=1.226.2.37.2.62&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.61
php-src/run-tests.php:1.226.2.37.2.62
--- php-src/run-tests.php:1.226.2.37.2.61 Thu Apr 16 13:43:28 2009
+++ php-src/run-tests.php Sat Apr 25 16:54:50 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.61 2009/04/16 13:43:28 bjori Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.62 2009/04/25 16:54:50 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -71,14 +71,15 @@
define("PHP_MAJOR_VERSION", $major);
}
-// __DIR__ and FILE_BINARY is available from 5.3.0
+// __DIR__ is available from 5.3.0
if (PHP_VERSION_ID < 50300) {
define('__DIR__', realpath(dirname(__FILE__)));
- define('FILE_BINARY', 0);
+ // FILE_BINARY is available from 5.2.7
+ if (PHP_VERSION_ID < 50207) {
+ define('FILE_BINARY', 0);
+ }
}
-
-
// If timezone is not set, use UTC.
if (ini_get('date.timezone') == '') {
date_default_timezone_set('UTC');
@@ -632,7 +633,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.61 $' .
"\n";
+ echo '$Revision: 1.226.2.37.2.62 $' .
"\n";
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib parse_tz.c
nlopess Sat Apr 25 16:42:24 2009 UTC
Modified files:
/php-src/ext/date/lib parse_tz.c
Log:
MFB: fix strict aliasing issues
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_tz.c?r1=1.40&r2=1.41&diff_format=u
Index: php-src/ext/date/lib/parse_tz.c
diff -u php-src/ext/date/lib/parse_tz.c:1.40
php-src/ext/date/lib/parse_tz.c:1.41
--- php-src/ext/date/lib/parse_tz.c:1.40Tue Mar 10 23:39:12 2009
+++ php-src/ext/date/lib/parse_tz.c Sat Apr 25 16:42:24 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_tz.c,v 1.40 2009/03/10 23:39:12 helly Exp $ */
+/* $Id: parse_tz.c,v 1.41 2009/04/25 16:42:24 nlopess Exp $ */
#include "timelib.h"
@@ -45,7 +45,7 @@
#define timelib_conv_int(l) ((l & 0x00ff) << 24) + ((l & 0xff00) << 8)
+ ((l & 0x00ff) >> 8) + ((l & 0xff00) >> 24)
#endif
-static void read_preamble(char **tzf, timelib_tzinfo *tz)
+static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
{
/* skip ID */
*tzf += 4;
@@ -63,7 +63,7 @@
*tzf += 13;
}
-static void read_header(char **tzf, timelib_tzinfo *tz)
+static void read_header(const unsigned char **tzf, timelib_tzinfo *tz)
{
uint32_t buffer[6];
@@ -77,7 +77,7 @@
*tzf += sizeof(buffer);
}
-static void read_transistions(char **tzf, timelib_tzinfo *tz)
+static void read_transistions(const unsigned char **tzf, timelib_tzinfo *tz)
{
int32_t *buffer = NULL;
uint32_t i;
@@ -106,7 +106,7 @@
tz->trans_idx = cbuffer;
}
-static void read_types(char **tzf, timelib_tzinfo *tz)
+static void read_types(const unsigned char **tzf, timelib_tzinfo *tz)
{
unsigned char *buffer;
int32_t *leap_buffer;
@@ -187,7 +187,7 @@
}
}
-static void read_location(char **tzf, timelib_tzinfo *tz)
+static void read_location(const unsigned char **tzf, timelib_tzinfo *tz)
{
uint32_t buffer[3];
uint32_t comments_len;
@@ -296,11 +296,11 @@
if (seek_to_tz_position(&tzf, timezone, tzdb)) {
tmp = timelib_tzinfo_ctor(timezone);
- read_preamble((char**) &tzf, tmp);
- read_header((char**) &tzf, tmp);
- read_transistions((char**) &tzf, tmp);
- read_types((char**) &tzf, tmp);
- read_location((char**) &tzf, tmp);
+ read_preamble(&tzf, tmp);
+ read_header(&tzf, tmp);
+ read_transistions(&tzf, tmp);
+ read_types(&tzf, tmp);
+ read_location(&tzf, tmp);
} else {
tmp = NULL;
}
--
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/imap php_imap.c
pajoye Sat Apr 25 16:36:02 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/imap php_imap.c
Log:
- ws
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.46&r2=1.208.2.7.2.47&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.46
php-src/ext/imap/php_imap.c:1.208.2.7.2.47
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.46 Fri Apr 24 14:53:59 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 16:36:02 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.46 2009/04/24 14:53:59 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.47 2009/04/25 16:36:02 pajoye Exp $ */
#define IMAP41
@@ -241,7 +241,7 @@
static int add_assoc_object(zval *arg, char *key, zval *tmp TSRMLS_DC)
{
HashTable *symtable;
-
+
if (Z_TYPE_P(arg) == IS_OBJECT) {
symtable = Z_OBJPROP_P(arg);
} else {
@@ -256,14 +256,14 @@
static inline int add_next_index_object(zval *arg, zval *tmp TSRMLS_DC)
{
HashTable *symtable;
-
+
if (Z_TYPE_P(arg) == IS_OBJECT) {
symtable = Z_OBJPROP_P(arg);
} else {
symtable = Z_ARRVAL_P(arg);
}
- return zend_hash_next_index_insert(symtable, (void *) &tmp, sizeof(zval
*), NULL);
+ return zend_hash_next_index_insert(symtable, (void *) &tmp, sizeof(zval
*), NULL);
}
/* }}} */
@@ -334,7 +334,7 @@
/* }}} */
/* {{{ mail_newmessagelist
- *
+ *
* Mail instantiate MESSAGELIST
* Returns: new MESSAGELIST list
* Author: CJH
@@ -365,8 +365,8 @@
}
/* }}} */
-#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
-/* {{{ mail_getquota
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+/* {{{ mail_getquota
*
* Mail GET_QUOTA callback
* Called via the mail_parameter function in c-client:src/c-client/mail.c
@@ -377,7 +377,7 @@
{
zval *t_map, *return_value;
TSRMLS_FETCH();
-
+
return_value = *IMAPG(quota_return);
/* put parsing code here */
@@ -472,7 +472,7 @@
#ifndef PHP_WIN32
auth_link(&auth_log); /* link in the log authenticator */
- auth_link(&auth_md5); /* link in the cram-md5 authenticator */
+ auth_link(&auth_md5); /* link in the cram-md5 authenticator */
#if HAVE_IMAP_KRB && defined(HAVE_IMAP_AUTH_GSS)
auth_link(&auth_gss); /* link in the gss authenticator */
#endif
@@ -522,13 +522,13 @@
REGISTER_LONG_CONSTANT("OP_SECURE", OP_SECURE, CONST_PERSISTENT |
CONST_CS);
/* don't do non-secure authentication */
- /*
+ /*
PHP re-assigns CL_EXPUNGE a custom value that can be used as part of
the imap_open() bitfield
- because it seems like a good idea to be able to indicate that the
mailbox should be
+ because it seems like a good idea to be able to indicate that the
mailbox should be
automatically expunged during imap_open in case the script get
interrupted and it doesn't get
to the imap_close() where this option is normally placed. If the
c-client library adds other
- options and the value for this one conflicts, simply make PHP_EXPUNGE
higher at the top of
- this file
+ options and the value for this one conflicts, simply make PHP_EXPUNGE
higher at the top of
+ this file
*/
REGISTER_LONG_CONSTANT("CL_EXPUNGE", PHP_EXPUNGE, CONST_PERSISTENT |
CONST_CS);
/* expunge silently */
@@ -759,7 +759,7 @@
long flags=NIL;
long cl_flags=NIL;
int myargc = ZEND_NUM_ARGS();
-
+
if (myargc < 3 || myargc > 5 || zend_get_parameters_ex(myargc,
&mailbox, &user, &passwd, &options, &retries) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
}
@@ -776,17 +776,17 @@
}
}
- if (IMAPG(imap_user)) {
+ if (IMAPG(imap_user)) {
efree(IMAPG(imap_user));
}
- if (IMAPG(imap_password)) {
+ if (IMAPG(imap_password)) {
efree(IMAPG(imap_password));
}
/* local filename, need to perform open_basedir and safe_mode checks */
- if (Z_STRVAL_PP(mailbox)[0] != '{' &&
- (php_check_open_basedir(Z_STRVAL_PP(mailbox) TSRMLS_CC)
||
+ if (Z_STRVAL_PP(mailbox)[0] != '{' &&
+ (php_check_open_basedir(Z_STRVAL_PP(mailbox) TSRMLS_CC)
||
(PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(mailbox),
NULL, CHECKUID_CHECK_FILE_AND_DIR {
RETURN_FALSE;
}
@@ -816,7 +816,7 @@
imap_le_struct = emalloc(sizeof(pils));
imap_le_struct->imap_stream = imap_stream;
- imap_le_struct->flags = cl_flags;
+ imap_le_struct->flags = cl_flags;
ZEND_REGISTER_RESO
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
pajoye Sat Apr 25 16:35:36 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- ws
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.279&r2=1.280&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.279 php-src/ext/imap/php_imap.c:1.280
--- php-src/ext/imap/php_imap.c:1.279 Sat Apr 25 15:13:00 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 16:35:36 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.279 2009/04/25 15:13:00 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.280 2009/04/25 16:35:36 pajoye Exp $ */
#define IMAP41
@@ -598,7 +598,7 @@
static int add_assoc_object(zval *arg, char *key, zval *tmp TSRMLS_DC)
{
HashTable *symtable;
-
+
if (Z_TYPE_P(arg) == IS_OBJECT) {
symtable = Z_OBJPROP_P(arg);
} else {
@@ -613,14 +613,14 @@
static inline int add_next_index_object(zval *arg, zval *tmp TSRMLS_DC)
{
HashTable *symtable;
-
+
if (Z_TYPE_P(arg) == IS_OBJECT) {
symtable = Z_OBJPROP_P(arg);
} else {
symtable = Z_ARRVAL_P(arg);
}
- return zend_hash_next_index_insert(symtable, (void *) &tmp, sizeof(zval
*), NULL);
+ return zend_hash_next_index_insert(symtable, (void *) &tmp, sizeof(zval
*), NULL);
}
/* }}} */
@@ -691,7 +691,7 @@
/* }}} */
/* {{{ mail_newmessagelist
- *
+ *
* Mail instantiate MESSAGELIST
* Returns: new MESSAGELIST list
* Author: CJH
@@ -722,8 +722,8 @@
}
/* }}} */
-#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
-/* {{{ mail_getquota
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+/* {{{ mail_getquota
*
* Mail GET_QUOTA callback
* Called via the mail_parameter function in c-client:src/c-client/mail.c
@@ -734,7 +734,7 @@
{
zval *t_map, *return_value;
TSRMLS_FETCH();
-
+
return_value = *IMAPG(quota_return);
/* put parsing code here */
@@ -829,7 +829,7 @@
#ifndef PHP_WIN32
auth_link(&auth_log); /* link in the log authenticator */
- auth_link(&auth_md5); /* link in the cram-md5 authenticator */
+ auth_link(&auth_md5); /* link in the cram-md5 authenticator */
#if HAVE_IMAP_KRB && defined(HAVE_IMAP_AUTH_GSS)
auth_link(&auth_gss); /* link in the gss authenticator */
#endif
@@ -879,13 +879,13 @@
REGISTER_LONG_CONSTANT("OP_SECURE", OP_SECURE, CONST_PERSISTENT |
CONST_CS);
/* don't do non-secure authentication */
- /*
+ /*
PHP re-assigns CL_EXPUNGE a custom value that can be used as part of
the imap_open() bitfield
- because it seems like a good idea to be able to indicate that the
mailbox should be
+ because it seems like a good idea to be able to indicate that the
mailbox should be
automatically expunged during imap_open in case the script get
interrupted and it doesn't get
to the imap_close() where this option is normally placed. If the
c-client library adds other
- options and the value for this one conflicts, simply make PHP_EXPUNGE
higher at the top of
- this file
+ options and the value for this one conflicts, simply make PHP_EXPUNGE
higher at the top of
+ this file
*/
REGISTER_LONG_CONSTANT("CL_EXPUNGE", PHP_EXPUNGE, CONST_PERSISTENT |
CONST_CS);
/* expunge silently */
@@ -1143,8 +1143,8 @@
MAILSTREAM *imap_stream;
pils *imap_le_struct;
int argc = ZEND_NUM_ARGS();
-
- if (zend_parse_parameters(argc TSRMLS_CC, "sss|ll", &mailbox,
&mailbox_len, &user, &user_len,
+
+ if (zend_parse_parameters(argc TSRMLS_CC, "sss|ll", &mailbox,
&mailbox_len, &user, &user_len,
&passwd, &passwd_len, &flags, &retries) == FAILURE) {
return;
}
@@ -1156,11 +1156,11 @@
}
}
- if (IMAPG(imap_user)) {
+ if (IMAPG(imap_user)) {
efree(IMAPG(imap_user));
}
- if (IMAPG(imap_password)) {
+ if (IMAPG(imap_password)) {
efree(IMAPG(imap_password));
}
@@ -1193,7 +1193,7 @@
imap_le_struct = emalloc(sizeof(pils));
imap_le_struct->imap_stream = imap_stream;
- imap_le_struct->flags = cl_flags;
+ imap_le_struct->flags = cl_flags;
ZEND_REGISTER_RESOURCE(return_value, imap_le_struct, le_imap);
}
@@ -1215,7 +1215,7 @@
char *mailbox;
int mailbox_len;
long options = 0, retries = 0;
- pils *imap_le_struct;
+ pils *imap_le_struct;
MAILSTREAM *imap_stream;
long flags=NIL;
long cl_flags=NIL;
@@ -1232,7 +1232,7 @@
cl_flags = CL_EXPUNGE;
flags ^= PHP_EXPUNGE;
}
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
pajoye Sat Apr 25 16:33:51 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- ws
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.38&r2=1.208.2.7.2.26.2.39&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.38
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.39
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.38 Sat Apr 25 15:12:45 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 16:33:51 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.38 2009/04/25 15:12:45 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.39 2009/04/25 16:33:51 pajoye Exp $ */
#define IMAP41
@@ -598,7 +598,7 @@
static int add_assoc_object(zval *arg, char *key, zval *tmp TSRMLS_DC)
{
HashTable *symtable;
-
+
if (Z_TYPE_P(arg) == IS_OBJECT) {
symtable = Z_OBJPROP_P(arg);
} else {
@@ -613,14 +613,14 @@
static inline int add_next_index_object(zval *arg, zval *tmp TSRMLS_DC)
{
HashTable *symtable;
-
+
if (Z_TYPE_P(arg) == IS_OBJECT) {
symtable = Z_OBJPROP_P(arg);
} else {
symtable = Z_ARRVAL_P(arg);
}
- return zend_hash_next_index_insert(symtable, (void *) &tmp, sizeof(zval
*), NULL);
+ return zend_hash_next_index_insert(symtable, (void *) &tmp, sizeof(zval
*), NULL);
}
/* }}} */
@@ -691,7 +691,7 @@
/* }}} */
/* {{{ mail_newmessagelist
- *
+ *
* Mail instantiate MESSAGELIST
* Returns: new MESSAGELIST list
* Author: CJH
@@ -722,8 +722,8 @@
}
/* }}} */
-#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
-/* {{{ mail_getquota
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+/* {{{ mail_getquota
*
* Mail GET_QUOTA callback
* Called via the mail_parameter function in c-client:src/c-client/mail.c
@@ -734,7 +734,7 @@
{
zval *t_map, *return_value;
TSRMLS_FETCH();
-
+
return_value = *IMAPG(quota_return);
/* put parsing code here */
@@ -829,7 +829,7 @@
#ifndef PHP_WIN32
auth_link(&auth_log); /* link in the log authenticator */
- auth_link(&auth_md5); /* link in the cram-md5 authenticator */
+ auth_link(&auth_md5); /* link in the cram-md5 authenticator */
#if HAVE_IMAP_KRB && defined(HAVE_IMAP_AUTH_GSS)
auth_link(&auth_gss); /* link in the gss authenticator */
#endif
@@ -879,13 +879,13 @@
REGISTER_LONG_CONSTANT("OP_SECURE", OP_SECURE, CONST_PERSISTENT |
CONST_CS);
/* don't do non-secure authentication */
- /*
+ /*
PHP re-assigns CL_EXPUNGE a custom value that can be used as part of
the imap_open() bitfield
- because it seems like a good idea to be able to indicate that the
mailbox should be
+ because it seems like a good idea to be able to indicate that the
mailbox should be
automatically expunged during imap_open in case the script get
interrupted and it doesn't get
to the imap_close() where this option is normally placed. If the
c-client library adds other
- options and the value for this one conflicts, simply make PHP_EXPUNGE
higher at the top of
- this file
+ options and the value for this one conflicts, simply make PHP_EXPUNGE
higher at the top of
+ this file
*/
REGISTER_LONG_CONSTANT("CL_EXPUNGE", PHP_EXPUNGE, CONST_PERSISTENT |
CONST_CS);
/* expunge silently */
@@ -1143,8 +1143,8 @@
MAILSTREAM *imap_stream;
pils *imap_le_struct;
int argc = ZEND_NUM_ARGS();
-
- if (zend_parse_parameters(argc TSRMLS_CC, "sss|ll", &mailbox,
&mailbox_len, &user, &user_len,
+
+ if (zend_parse_parameters(argc TSRMLS_CC, "sss|ll", &mailbox,
&mailbox_len, &user, &user_len,
&passwd, &passwd_len, &flags, &retries) == FAILURE) {
return;
}
@@ -1156,17 +1156,17 @@
}
}
- if (IMAPG(imap_user)) {
+ if (IMAPG(imap_user)) {
efree(IMAPG(imap_user));
}
- if (IMAPG(imap_password)) {
+ if (IMAPG(imap_password)) {
efree(IMAPG(imap_password));
}
/* local filename, need to perform open_basedir and safe_mode checks */
- if (mailbox[0] != '{' &&
- (php_check_open_basedir(mailbox TSRMLS_CC) ||
+ if (mailbox[0] != '{' &&
+ (php_check_open_basedir(mailbox TSRMLS_CC) ||
(PG(safe_mode) && !php_checkuid(mailbox, NULL,
CHECKUID_CHECK_FILE_AND_DIR {
RETURN_FALSE;
}
@@ -1195,7 +1195,7 @@
imap_le_struct = emalloc(sizeof(pils));
imap_le_struct->imap_stream = imap_stream;
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib parse_tz.c
nlopess Sat Apr 25 16:33:41 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/lib parse_tz.c
Log:
fix strict aliasing problems.
this should fix the crash that Sebastian was having with gcc 4.4. Please
confirm this is the case
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_tz.c?r1=1.20.2.6.2.13.2.5&r2=1.20.2.6.2.13.2.6&diff_format=u
Index: php-src/ext/date/lib/parse_tz.c
diff -u php-src/ext/date/lib/parse_tz.c:1.20.2.6.2.13.2.5
php-src/ext/date/lib/parse_tz.c:1.20.2.6.2.13.2.6
--- php-src/ext/date/lib/parse_tz.c:1.20.2.6.2.13.2.5 Wed Dec 31 11:15:35 2008
+++ php-src/ext/date/lib/parse_tz.c Sat Apr 25 16:33:41 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_tz.c,v 1.20.2.6.2.13.2.5 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: parse_tz.c,v 1.20.2.6.2.13.2.6 2009/04/25 16:33:41 nlopess Exp $ */
#include "timelib.h"
@@ -49,7 +49,7 @@
#define timelib_conv_int(l) ((l & 0x00ff) << 24) + ((l & 0xff00) << 8)
+ ((l & 0x00ff) >> 8) + ((l & 0xff00) >> 24)
#endif
-static void read_preamble(char **tzf, timelib_tzinfo *tz)
+static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
{
/* skip ID */
*tzf += 4;
@@ -67,7 +67,7 @@
*tzf += 13;
}
-static void read_header(char **tzf, timelib_tzinfo *tz)
+static void read_header(const unsigned char **tzf, timelib_tzinfo *tz)
{
uint32_t buffer[6];
@@ -81,7 +81,7 @@
*tzf += sizeof(buffer);
}
-static void read_transistions(char **tzf, timelib_tzinfo *tz)
+static void read_transistions(const unsigned char **tzf, timelib_tzinfo *tz)
{
int32_t *buffer = NULL;
uint32_t i;
@@ -110,7 +110,7 @@
tz->trans_idx = cbuffer;
}
-static void read_types(char **tzf, timelib_tzinfo *tz)
+static void read_types(const unsigned char **tzf, timelib_tzinfo *tz)
{
unsigned char *buffer;
int32_t *leap_buffer;
@@ -191,7 +191,7 @@
}
}
-static void read_location(char **tzf, timelib_tzinfo *tz)
+static void read_location(const unsigned char **tzf, timelib_tzinfo *tz)
{
uint32_t buffer[3];
uint32_t comments_len;
@@ -317,11 +317,11 @@
if (seek_to_tz_position(&tzf, timezone, tzdb)) {
tmp = timelib_tzinfo_ctor(timezone);
- read_preamble((char**) &tzf, tmp);
- read_header((char**) &tzf, tmp);
- read_transistions((char**) &tzf, tmp);
- read_types((char**) &tzf, tmp);
- read_location((char**) &tzf, tmp);
+ read_preamble(&tzf, tmp);
+ read_header(&tzf, tmp);
+ read_transistions(&tzf, tmp);
+ read_types(&tzf, tmp);
+ read_location(&tzf, tmp);
} else {
tmp = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
I'd prefer to avoid introducing new functionality into 5.2 at this
point.
Ilia Alshanetsky
On 25-Apr-09, at 11:14 AM, Pierre Joye wrote:
hi Jani,
Yes, I will MFH it as well.
I also like to add mail_gc to 5.2 (coming to 5.3+) to allow one to
purge the cache while processing a large amount of mails (or large
mail) without having to call mail_close. But have to ask Ilia first :)
Cheers,
On Sat, Apr 25, 2009 at 5:11 PM, Jani Taskinen
wrote:
Isn't this necessary in PHP_5_2? Sounds like a bug fix to me..
--Jani
Pierre-Alain Joye kirjoitti:
pajoye Sat Apr 25 15:02:36 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c Log:
- MFH: SEARCHPGM struct has to be freed
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.34&r2=1.208.2.7.2.26.2.35&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.35
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34 Sat Apr 25
14:59:21 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:02:36 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski
|
+
--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.34 2009/04/25 14:59:21
pajoye Exp $
*/
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.35 2009/04/25 15:02:36
pajoye Exp $
*/
#define IMAP41
@@ -3902,6 +3902,7 @@
char *search_criteria;
MESSAGELIST *cur;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "rs|ls",
&streamind,
&criteria, &criteria_len, &flags, &charset, &charset_len) ==
FAILURE) {
return;
@@ -3912,7 +3913,14 @@
search_criteria = estrndup(criteria, criteria_len);
IMAPG(imap_messages) = IMAPG(imap_messages_tail) = NIL;
- mail_search_full(imap_le_struct->imap_stream, (argc == 4 ?
charset
: NIL), mail_criteria(search_criteria), flags);
+ pgm = mail_criteria(search_criteria);
+
+ mail_search_full(imap_le_struct->imap_stream, (argc == 4 ?
charset
: NIL), pgm, flags);
+
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
+
if (IMAPG(imap_messages) == NIL) {
efree(search_criteria);
RETURN_FALSE;
@@ -4518,6 +4526,7 @@
char criteria[] = "ALL";
THREADNODE *top;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "r|l",
&streamind,
&flags) == FAILURE) {
return;
@@ -4525,7 +4534,11 @@
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1,
"imap",
le_imap);
- top = mail_thread(imap_le_struct->imap_stream,
"REFERENCES", NIL,
mail_criteria(criteria), flags);
+ pgm = mail_criteria(criteria);
+ top = mail_thread(imap_le_struct->imap_stream,
"REFERENCES", NIL,
pgm, flags);
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
if(top == NIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function
returned an empty tree");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Pierre
http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/configuration/preconditions rtIfParallelHasPcntlTest.php
spriebsch Sat Apr 25 15:39:09 2009 UTC
Modified files:
/phpruntests/tests/configuration/preconditions
rtIfParallelHasPcntlTest.php
Log:
Refactored test and added comments.
http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php?r1=1.3&r2=1.4&diff_format=u
Index:
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php
diff -u
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php:1.3
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php:1.4
---
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php:1.3
Sat Apr 25 15:13:24 2009
+++ phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php
Sat Apr 25 15:39:09 2009
@@ -1,49 +1,83 @@
+ * @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/
+ */
require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__) . '../../../../src/rtAutoload.php';
+/**
+ * Tests for rtIfParallelHasPcntlTest precondition.
+ *
+ * @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/
+ */
class rtIfParallelHasPcntlTest extends PHPUnit_Framework_TestCase
{
-public function testLoaded()
+protected function setUp()
{
-$clo = new rtCommandLineOptions();
-$clo->parse(array('run-tests.php', '-z'));
-$env = rtEnvironmentVariables::getInstance();
-
-$pre = new rtIfParallelHasPcntl();
+$this->preCondition = new rtIfParallelHasPcntl();
+$this->commandLine = new rtCommandLineOptions();
-$this->assertEquals(extension_loaded('pcntl'), $pre->check($clo,
$env));
+$this->environment = rtEnvironmentVariables::getInstance();
}
-
-public function testLoaded2()
+
+protected function tearDown()
{
-$clo = new rtCommandLineOptions();
-$env = rtEnvironmentVariables::getInstance();
-$env->setVariable('TEST_PHP_PARALLEL', true);
-
-$pre = new rtIfParallelHasPcntl();
+unset($this->preCondition);
+unset($this->commandLine);
+unset($this->environment);
+}
-$this->assertTrue($pre->check($clo, $env));
+/**
+ * Ensure that check (wether pcntl is loaded) works
+ * when parallel test execution is requested by command line option.
+ */
+public function testCheckWhenCommandLineOptionIsSet()
+{
+$this->commandLine->parse(array('run-tests.php', '-z'));
+
+$this->assertEquals(extension_loaded('pcntl'),
$this->preCondition->check($this->commandLine, $this->environment));
}
-
-public function testNotRequired()
+
+/**
+ * Ensure that check (wether pcntl is loaded) works
+ * when parallel test execution is requested by environment variable.
+ */
+public function testCheckWhenEnvironmentVariableIsSet()
{
-$clo = new rtCommandLineOptions();
-$env = rtEnvironmentVariables::getInstance();
+$this->environment->setVariable('TEST_PHP_PARALLEL', true);
-$pre = new rtIfParallelHasPcntl();
+$this->assertTrue($this->preCondition->check($this->commandLine,
$this->environment));
+}
-$this->assertTrue($pre->check($clo, $env));
+/**
+ * Ensure that check returns true when no parallel test execution is
requested.
+ */
+public function testCheckWhenParallelExecutionIsNotRequired()
+{
+$this->assertTrue($this->preCondition->check($this->commandLine,
$this->environment));
}
+/**
+ * Ensure that the error message is correct.
+ */
public function testgetMessage()
{
-$pre = new rtIfParallelHasPcntl();
-
-$this->assertEquals($pre->getMessage('pcntlNotLoaded'),
rtText::get('pcntlNotLoaded'));
+$this->assertEquals($this->preCondition->getMessage('pcntlNotLoaded'),
rtText::get('pcntlNotLoaded'));
}
-
-//Not sure how to check if it's not loaded?
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
hi Jani,
Yes, I will MFH it as well.
I also like to add mail_gc to 5.2 (coming to 5.3+) to allow one to
purge the cache while processing a large amount of mails (or large
mail) without having to call mail_close. But have to ask Ilia first :)
Cheers,
On Sat, Apr 25, 2009 at 5:11 PM, Jani Taskinen wrote:
>
> Isn't this necessary in PHP_5_2? Sounds like a bug fix to me..
>
> --Jani
>
>
> Pierre-Alain Joye kirjoitti:
>>
>> pajoye Sat Apr 25 15:02:36 2009 UTC
>>
>> Modified files: (Branch: PHP_5_3)
>> /php-src/ext/imap php_imap.c Log:
>> - MFH: SEARCHPGM struct has to be freed
>>
>> http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.34&r2=1.208.2.7.2.26.2.35&diff_format=u
>> Index: php-src/ext/imap/php_imap.c
>> diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34
>> php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.35
>> --- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34 Sat Apr 25
>> 14:59:21 2009
>> +++ php-src/ext/imap/php_imap.c Sat Apr 25 15:02:36 2009
>> @@ -26,7 +26,7 @@
>> | PHP 4.0 updates: Zeev Suraski
>> |
>>
>> +--+
>> */
>> -/* $Id: php_imap.c,v 1.208.2.7.2.26.2.34 2009/04/25 14:59:21 pajoye Exp $
>> */
>> +/* $Id: php_imap.c,v 1.208.2.7.2.26.2.35 2009/04/25 15:02:36 pajoye Exp $
>> */
>> #define IMAP41
>> @@ -3902,6 +3902,7 @@
>> char *search_criteria;
>> MESSAGELIST *cur;
>> int argc = ZEND_NUM_ARGS();
>> + SEARCHPGM *pgm = NIL;
>> if (zend_parse_parameters(argc TSRMLS_CC, "rs|ls", &streamind,
>> &criteria, &criteria_len, &flags, &charset, &charset_len) == FAILURE) {
>> return;
>> @@ -3912,7 +3913,14 @@
>> search_criteria = estrndup(criteria, criteria_len);
>>
>> IMAPG(imap_messages) = IMAPG(imap_messages_tail) = NIL;
>> - mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset
>> : NIL), mail_criteria(search_criteria), flags);
>> + pgm = mail_criteria(search_criteria);
>> +
>> + mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset
>> : NIL), pgm, flags);
>> +
>> + if (pgm) {
>> + mail_free_searchpgm(&pgm);
>> + }
>> +
>> if (IMAPG(imap_messages) == NIL) {
>> efree(search_criteria);
>> RETURN_FALSE;
>> @@ -4518,6 +4526,7 @@
>> char criteria[] = "ALL";
>> THREADNODE *top;
>> int argc = ZEND_NUM_ARGS();
>> + SEARCHPGM *pgm = NIL;
>> if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind,
>> &flags) == FAILURE) {
>> return;
>> @@ -4525,7 +4534,11 @@
>>
>> ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap",
>> le_imap);
>>
>> - top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL,
>> mail_criteria(criteria), flags);
>> + pgm = mail_criteria(criteria);
>> + top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL,
>> pgm, flags);
>> + if (pgm) {
>> + mail_free_searchpgm(&pgm);
>> + }
>> if(top == NIL) {
>> php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function
>> returned an empty tree");
>>
>>
>>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
Pierre
http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/configuration/preconditions rtIfParallelHasPcntl.php
spriebsch Sat Apr 25 15:13:53 2009 UTC
Modified files:
/phpruntests/src/configuration/preconditions
rtIfParallelHasPcntl.php
Log:
Simplified method.
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/preconditions/rtIfParallelHasPcntl.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/preconditions/rtIfParallelHasPcntl.php
diff -u
phpruntests/src/configuration/preconditions/rtIfParallelHasPcntl.php:1.2
phpruntests/src/configuration/preconditions/rtIfParallelHasPcntl.php:1.3
--- phpruntests/src/configuration/preconditions/rtIfParallelHasPcntl.php:1.2
Mon Apr 20 20:24:30 2009
+++ phpruntests/src/configuration/preconditions/rtIfParallelHasPcntl.php
Sat Apr 25 15:13:53 2009
@@ -24,9 +24,7 @@
public function check(rtCommandLineOptions $commandLine = null,
rtEnvironmentVariables $environmentVariables = null)
{
if ($commandLine->hasOption('z') ||
$environmentVariables->hasVariable('TESTS_PHP_PARALLEL')) {
-if (!extension_loaded('pcntl')) {
-return false;
-}
+return extension_loaded('pcntl');
}
return true;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/configuration/preconditions rtIfParallelHasPcntlTest.php
spriebsch Sat Apr 25 15:13:24 2009 UTC
Modified files:
/phpruntests/tests/configuration/preconditions
rtIfParallelHasPcntlTest.php
Log:
Fixed test to work then no pcntl extension is loaded.
http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php?r1=1.2&r2=1.3&diff_format=u
Index:
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php
diff -u
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php:1.2
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php:1.3
---
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php:1.2
Mon Apr 20 20:50:39 2009
+++ phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php
Sat Apr 25 15:13:24 2009
@@ -13,7 +13,7 @@
$pre = new rtIfParallelHasPcntl();
-$this->assertTrue($pre->check($clo, $env));
+$this->assertEquals(extension_loaded('pcntl'), $pre->check($clo,
$env));
}
public function testLoaded2()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
pajoye Sat Apr 25 15:13:00 2009 UTC Modified files: /php-src/ext/imap php_imap.c Log: - #elif http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.278&r2=1.279&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.278 php-src/ext/imap/php_imap.c:1.279 --- php-src/ext/imap/php_imap.c:1.278 Sat Apr 25 15:08:25 2009 +++ php-src/ext/imap/php_imap.c Sat Apr 25 15:13:00 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski| +--+ */ -/* $Id: php_imap.c,v 1.278 2009/04/25 15:08:25 pajoye Exp $ */ +/* $Id: php_imap.c,v 1.279 2009/04/25 15:13:00 pajoye Exp $ */ #define IMAP41 @@ -1079,9 +1079,9 @@ #if !defined(CCLIENTVERSION) #if HAVE_IMAP2007e #define CCLIENTVERSION "2007e" -#if HAVE_IMAP2007e +#elif HAVE_IMAP2007e #define CCLIENTVERSION "2007d" -#if HAVE_IMAP2007d +#elif HAVE_IMAP2007b #define CCLIENTVERSION "2007b" #elif HAVE_IMAP2007a #define CCLIENTVERSION "2007a" @@ -1106,9 +1106,9 @@ php_info_print_table_row(2, "IMAP c-Client Version", CCLIENTVERSION); #if HAVE_IMAP2007e php_info_print_table_row(2, "IMAP c-Client Version", "2007e"); -#if HAVE_IMAP2007d +#elif HAVE_IMAP2007d php_info_print_table_row(2, "IMAP c-Client Version", "2007d"); -#if HAVE_IMAP2007b +#elif HAVE_IMAP2007b php_info_print_table_row(2, "IMAP c-Client Version", "2007b"); #elif HAVE_IMAP2007a php_info_print_table_row(2, "IMAP c-Client Version", "2007a"); -- 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/imap php_imap.c
pajoye Sat Apr 25 15:12:45 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/imap php_imap.c Log: - #elif http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.37&r2=1.208.2.7.2.26.2.38&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.37 php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.38 --- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.37 Sat Apr 25 15:08:10 2009 +++ php-src/ext/imap/php_imap.c Sat Apr 25 15:12:45 2009 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski| +--+ */ -/* $Id: php_imap.c,v 1.208.2.7.2.26.2.37 2009/04/25 15:08:10 pajoye Exp $ */ +/* $Id: php_imap.c,v 1.208.2.7.2.26.2.38 2009/04/25 15:12:45 pajoye Exp $ */ #define IMAP41 @@ -1079,9 +1079,9 @@ #if !defined(CCLIENTVERSION) #if HAVE_IMAP2007e #define CCLIENTVERSION "2007e" -#if HAVE_IMAP2007e +#elif HAVE_IMAP2007e #define CCLIENTVERSION "2007d" -#if HAVE_IMAP2007d +#elif HAVE_IMAP2007b #define CCLIENTVERSION "2007b" #elif HAVE_IMAP2007a #define CCLIENTVERSION "2007a" @@ -1106,9 +1106,9 @@ php_info_print_table_row(2, "IMAP c-Client Version", CCLIENTVERSION); #if HAVE_IMAP2007e php_info_print_table_row(2, "IMAP c-Client Version", "2007e"); -#if HAVE_IMAP2007d +#elif HAVE_IMAP2007d php_info_print_table_row(2, "IMAP c-Client Version", "2007d"); -#if HAVE_IMAP2007b +#elif HAVE_IMAP2007b php_info_print_table_row(2, "IMAP c-Client Version", "2007b"); #elif HAVE_IMAP2007a php_info_print_table_row(2, "IMAP c-Client Version", "2007a"); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
Again, this should be MFH'd to PHP_5_2 as well.
Pierre-Alain Joye kirjoitti:
pajoye Sat Apr 25 15:06:34 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- add 2007d and e
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.35&r2=1.208.2.7.2.26.2.36&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.35
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.36
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.35 Sat Apr 25 15:02:36 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:06:34 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.35 2009/04/25 15:02:36 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.36 2009/04/25 15:06:34 pajoye Exp $ */
#define IMAP41
@@ -1077,7 +1077,15 @@
/* }}} */
#if !defined(CCLIENTVERSION)
-#if HAVE_IMAP2004
+#if HAVE_IMAP2007e
+#define CCLIENTVERSION "2007e"
+#if HAVE_IMAP2007e
+#define CCLIENTVERSION "2007d"
+#if HAVE_IMAP2007d
+#define CCLIENTVERSION "2007b"
+#elif HAVE_IMAP2007a
+#define CCLIENTVERSION "2007a"
+#elif HAVE_IMAP2004
#define CCLIENTVERSION "2004"
#elif HAVE_IMAP2001
#define CCLIENTVERSION "2001"
@@ -1096,6 +1104,10 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "IMAP c-Client Version", CCLIENTVERSION);
+#if HAVE_IMAP2007e
+ php_info_print_table_row(2, "IMAP c-Client Version", "2007e");
+#if HAVE_IMAP2007d
+ php_info_print_table_row(2, "IMAP c-Client Version", "2007d");
#if HAVE_IMAP2007b
php_info_print_table_row(2, "IMAP c-Client Version", "2007b");
#elif HAVE_IMAP2007a
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
Isn't this necessary in PHP_5_2? Sounds like a bug fix to me..
--Jani
Pierre-Alain Joye kirjoitti:
pajoye Sat Apr 25 15:02:36 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- MFH: SEARCHPGM struct has to be freed
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.34&r2=1.208.2.7.2.26.2.35&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.35
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34 Sat Apr 25 14:59:21 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:02:36 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.34 2009/04/25 14:59:21 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.35 2009/04/25 15:02:36 pajoye Exp $ */
#define IMAP41
@@ -3902,6 +3902,7 @@
char *search_criteria;
MESSAGELIST *cur;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "rs|ls", &streamind, &criteria, &criteria_len, &flags, &charset, &charset_len) == FAILURE) {
return;
@@ -3912,7 +3913,14 @@
search_criteria = estrndup(criteria, criteria_len);
IMAPG(imap_messages) = IMAPG(imap_messages_tail) = NIL;
- mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset :
NIL), mail_criteria(search_criteria), flags);
+ pgm = mail_criteria(search_criteria);
+
+ mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset :
NIL), pgm, flags);
+
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
+
if (IMAPG(imap_messages) == NIL) {
efree(search_criteria);
RETURN_FALSE;
@@ -4518,6 +4526,7 @@
char criteria[] = "ALL";
THREADNODE *top;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind, &flags) == FAILURE) {
return;
@@ -4525,7 +4534,11 @@
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap",
le_imap);
- top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL,
mail_criteria(criteria), flags);
+ pgm = mail_criteria(criteria);
+ top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, pgm,
flags);
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
if(top == NIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function returned an
empty tree");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
pajoye Sat Apr 25 15:08:25 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- ws
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.277&r2=1.278&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.277 php-src/ext/imap/php_imap.c:1.278
--- php-src/ext/imap/php_imap.c:1.277 Sat Apr 25 15:06:03 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:08:25 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.277 2009/04/25 15:06:03 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.278 2009/04/25 15:08:25 pajoye Exp $ */
#define IMAP41
@@ -2198,7 +2198,6 @@
RETURN_FALSE;
}
-
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap",
le_imap);
if (msgno < 1) {
@@ -2977,13 +2976,11 @@
return;
}
-
if (flags && ((flags & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT)) != 0)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for
the options parameter");
RETURN_FALSE;
}
-
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap",
le_imap);
if ((argc == 3) && (flags & FT_UID)) {
@@ -3220,7 +3217,7 @@
return;
}
- if (flags && ((flags & ~FT_UID) != 0)) {
+ if (flags && ((flags & ~FT_UID) != 0)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for
the options parameter");
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
pajoye Sat Apr 25 15:08:10 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- ws
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.36&r2=1.208.2.7.2.26.2.37&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.36
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.37
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.36 Sat Apr 25 15:06:34 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:08:10 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.36 2009/04/25 15:06:34 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.37 2009/04/25 15:08:10 pajoye Exp $ */
#define IMAP41
@@ -2200,7 +2200,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for
the options parameter");
RETURN_FALSE;
}
-
+
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap",
le_imap);
if (msgno < 1) {
--
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/imap php_imap.c
pajoye Sat Apr 25 15:06:34 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- add 2007d and e
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.35&r2=1.208.2.7.2.26.2.36&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.35
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.36
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.35 Sat Apr 25 15:02:36 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:06:34 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.35 2009/04/25 15:02:36 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.36 2009/04/25 15:06:34 pajoye Exp $ */
#define IMAP41
@@ -1077,7 +1077,15 @@
/* }}} */
#if !defined(CCLIENTVERSION)
-#if HAVE_IMAP2004
+#if HAVE_IMAP2007e
+#define CCLIENTVERSION "2007e"
+#if HAVE_IMAP2007e
+#define CCLIENTVERSION "2007d"
+#if HAVE_IMAP2007d
+#define CCLIENTVERSION "2007b"
+#elif HAVE_IMAP2007a
+#define CCLIENTVERSION "2007a"
+#elif HAVE_IMAP2004
#define CCLIENTVERSION "2004"
#elif HAVE_IMAP2001
#define CCLIENTVERSION "2001"
@@ -1096,6 +1104,10 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "IMAP c-Client Version", CCLIENTVERSION);
+#if HAVE_IMAP2007e
+ php_info_print_table_row(2, "IMAP c-Client Version", "2007e");
+#if HAVE_IMAP2007d
+ php_info_print_table_row(2, "IMAP c-Client Version", "2007d");
#if HAVE_IMAP2007b
php_info_print_table_row(2, "IMAP c-Client Version", "2007b");
#elif HAVE_IMAP2007a
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
pajoye Sat Apr 25 15:06:03 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- sync 5.3
- add 2007d and 2007e
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.276&r2=1.277&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.276 php-src/ext/imap/php_imap.c:1.277
--- php-src/ext/imap/php_imap.c:1.276 Sat Apr 25 15:02:03 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:06:03 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.276 2009/04/25 15:02:03 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.277 2009/04/25 15:06:03 pajoye Exp $ */
#define IMAP41
@@ -1077,7 +1077,11 @@
/* }}} */
#if !defined(CCLIENTVERSION)
-#if HAVE_IMAP2007b
+#if HAVE_IMAP2007e
+#define CCLIENTVERSION "2007e"
+#if HAVE_IMAP2007e
+#define CCLIENTVERSION "2007d"
+#if HAVE_IMAP2007d
#define CCLIENTVERSION "2007b"
#elif HAVE_IMAP2007a
#define CCLIENTVERSION "2007a"
@@ -1100,6 +1104,25 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "IMAP c-Client Version", CCLIENTVERSION);
+#if HAVE_IMAP2007e
+ php_info_print_table_row(2, "IMAP c-Client Version", "2007e");
+#if HAVE_IMAP2007d
+ php_info_print_table_row(2, "IMAP c-Client Version", "2007d");
+#if HAVE_IMAP2007b
+ php_info_print_table_row(2, "IMAP c-Client Version", "2007b");
+#elif HAVE_IMAP2007a
+ php_info_print_table_row(2, "IMAP c-Client Version", "2007a");
+#elif HAVE_IMAP2004
+ php_info_print_table_row(2, "IMAP c-Client Version", "2004");
+#elif HAVE_IMAP2001
+ php_info_print_table_row(2, "IMAP c-Client Version", "2001");
+#elif HAVE_IMAP2000
+ php_info_print_table_row(2, "IMAP c-Client Version", "2000");
+#elif defined(IMAP41)
+ php_info_print_table_row(2, "IMAP c-Client Version", "4.1");
+#else
+ php_info_print_table_row(2, "IMAP c-Client Version", "4.0");
+#endif
#if HAVE_IMAP_SSL
php_info_print_table_row(2, "SSL Support", "enabled");
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/testcase rtTestConfigurationTest.php
zoe Sat Apr 25 15:05:45 2009 UTC
Modified files:
/phpruntests/tests/testcase rtTestConfigurationTest.php
Log:
Adding check for CGI executable
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtTestConfigurationTest.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/tests/testcase/rtTestConfigurationTest.php
diff -u phpruntests/tests/testcase/rtTestConfigurationTest.php:1.3
phpruntests/tests/testcase/rtTestConfigurationTest.php:1.4
--- phpruntests/tests/testcase/rtTestConfigurationTest.php:1.3 Fri Apr 24
09:42:01 2009
+++ phpruntests/tests/testcase/rtTestConfigurationTest.php Sat Apr 25
15:05:45 2009
@@ -19,7 +19,7 @@
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
$config->configure();
-$testConfiguration = new rtTestConfiguration($config, $this->sections);
+$testConfiguration = new rtTestConfiguration($config, $this->sections,
array());
$this->assertEquals('rtTestConfiguration',
get_class($testConfiguration));
}
@@ -29,7 +29,7 @@
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
$config->configure();
-$testConfiguration = new rtTestConfiguration($config, $this->sections);
+$testConfiguration = new rtTestConfiguration($config, $this->sections,
array());
$envVars = $testConfiguration->getEnvironmentVariables();
@@ -41,7 +41,7 @@
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
$config->configure();
-$testConfiguration = new rtTestConfiguration($config, $this->sections);
+$testConfiguration = new rtTestConfiguration($config, $this->sections,
array());
$args = $testConfiguration->getTestCommandLineArguments();
@@ -53,11 +53,35 @@
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
$config->configure();
-$testConfiguration = new rtTestConfiguration($config, $this->sections);
+$testConfiguration = new rtTestConfiguration($config, $this->sections,
array());
$phpargs = $testConfiguration->getPhpCommandLineArguments();
$match = preg_match("/-d \"error_reporting=E_ALL | E_STRICT |
E_DEPRECATED\" -d \"assert.active=1\"/", $phpargs);
$this->assertEquals(1, $match);
}
+
+public function testPHPExecutable()
+{
+$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
+$config->configure();
+
+$testConfiguration = new rtTestConfiguration($config, $this->sections,
array());
+$phpExe = $testConfiguration->getPhpExecutable();
+
+$this->assertEquals('a-php-exe', $phpExe);
+}
+
+public function testPHPCgiExecutable()
+{
+$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', 'a-php-exe', 'test.phpt'));
+$config->setEnvironmentVariable('TEST_PHP_CGI_EXECUTABLE',
'a-php-cgi-exe');
+$config->configure();
+
+
+$testConfiguration = new rtTestConfiguration($config, $this->sections,
array('GET'));
+$phpExe = $testConfiguration->getPhpExecutable();
+
+$this->assertEquals('a-php-cgi-exe', $phpExe);
+}
}
?>
--
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 rtTestConfiguration.php
zoe Sat Apr 25 15:04:23 2009 UTC
Modified files:
/phpruntests/src/testcase rtPhpTest.php rtTestConfiguration.php
Log:
Adding check for CGI executable
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtPhpTest.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/rtPhpTest.php
diff -u phpruntests/src/testcase/rtPhpTest.php:1.2
phpruntests/src/testcase/rtPhpTest.php:1.3
--- phpruntests/src/testcase/rtPhpTest.php:1.2 Fri Apr 24 08:41:26 2009
+++ phpruntests/src/testcase/rtPhpTest.php Sat Apr 25 15:04:23 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
+ *
*/
+
class rtPhpTest
{
public $testConfiguration;
@@ -54,7 +64,7 @@
public function init(rtRuntestsConfiguration $runConfiguration)
{
-$this->testConfiguration = new rtTestConfiguration($runConfiguration,
$this->sections);
+$this->testConfiguration = new rtTestConfiguration($runConfiguration,
$this->sections, $this->sectionHeadings);
}
//run
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/testcase/rtTestConfiguration.php
diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.2
phpruntests/src/testcase/rtTestConfiguration.php:1.3
--- phpruntests/src/testcase/rtTestConfiguration.php:1.2Fri Apr 24
08:41:26 2009
+++ phpruntests/src/testcase/rtTestConfiguration.phpSat Apr 25 15:04:23 2009
@@ -1,36 +1,57 @@
+ * @author Stefan Priebsch
+ * @copyright 2009 The PHP Group
+ * @licensehttp://www.php.net/license/3_01.txt PHP License 3.01
+ *
*/
+
+
class rtTestConfiguration
{
private $environmentVariables;
private $phpCommandLineArguments;
private $testCommandLineArguments;
+private $phpExecutable;
+private $cgiSections = array(
+'GET',
+'POST',
+'POST_RAW',
+'GZIP_POST',
+'DEFLATE_POST',
+'EXPECTHEADERS',
+'COOKIE',
+);
-public function __construct(rtRuntestsConfiguration $runConfiguration,
$sections)
+public function __construct(rtRuntestsConfiguration $runConfiguration,
$sections, $sectionHeadings)
{
-$this->init($runConfiguration, $sections);
+$this->init($runConfiguration, $sections, $sectionHeadings);
}
-private function init(rtRuntestsConfiguration $runConfiguration, $sections)
+private function init(rtRuntestsConfiguration $runConfiguration,
$sections, $sectionHeadings)
{
$this->setEnvironmentVariables($runConfiguration, $sections);
$this->setPhpCommandLineArguments($runConfiguration, $sections);
$this->setTestCommandLineArguments($sections);
+$this->setPhpExecutable($runConfiguration, $sectionHeadings);
}
private function setEnvironmentVariables(rtRuntestsConfiguration
$runConfiguration, $sections)
{
$this->environmentVariables =
$runConfiguration->getEnvironmentVariables();
-if (array_key_exists('ENV', $sections)) {
+if (array_key_exists('ENV', $sections)) {
$this->environmentVariables =
array_merge($this->environmentVariables,
$sections['ENV']->getTestEnvironmentVariables());
}
}
-private function setPhpCommandLineArguments(rtRuntestsConfiguration
$runConfiguration, $sections)
+private function setPhpCommandLineArguments(rtRuntestsConfiguration
$runConfiguration, $sections)
{
$this->phpCommandLineArguments =
$runConfiguration->getSetting('PhpCommandLineArguments');
if (array_key_exists('INI', $sections)) {
@@ -49,6 +70,21 @@
}
}
+private function setPhpExecutable($runConfiguration, $sectionHeadings)
+{
+$tempArray = array_diff($this->cgiSections, $sectionHeadings);
+if (count($tempArray) < count($this->cgiSections)) {
+$this->phpExecutable =
$runConfiguration->getSetting('PhpCgiExecutable');
+} else {
+$this->phpExecutable =
$runConfiguration->getSetting('PhpExecutable');
+}
+}
+
+public function getPhpExecutable()
+{
+return $this->phpExecutable;
+}
+
public function getEnvironmentVariables()
{
return $this->environmentVariables;
--
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/imap php_imap.c
pajoye Sat Apr 25 15:02:36 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- MFH: SEARCHPGM struct has to be freed
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.34&r2=1.208.2.7.2.26.2.35&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.35
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34 Sat Apr 25 14:59:21 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:02:36 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.34 2009/04/25 14:59:21 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.35 2009/04/25 15:02:36 pajoye Exp $ */
#define IMAP41
@@ -3902,6 +3902,7 @@
char *search_criteria;
MESSAGELIST *cur;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "rs|ls", &streamind,
&criteria, &criteria_len, &flags, &charset, &charset_len) == FAILURE) {
return;
@@ -3912,7 +3913,14 @@
search_criteria = estrndup(criteria, criteria_len);
IMAPG(imap_messages) = IMAPG(imap_messages_tail) = NIL;
- mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset :
NIL), mail_criteria(search_criteria), flags);
+ pgm = mail_criteria(search_criteria);
+
+ mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset :
NIL), pgm, flags);
+
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
+
if (IMAPG(imap_messages) == NIL) {
efree(search_criteria);
RETURN_FALSE;
@@ -4518,6 +4526,7 @@
char criteria[] = "ALL";
THREADNODE *top;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind, &flags) ==
FAILURE) {
return;
@@ -4525,7 +4534,11 @@
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap",
le_imap);
- top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL,
mail_criteria(criteria), flags);
+ pgm = mail_criteria(criteria);
+ top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, pgm,
flags);
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
if(top == NIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function returned
an empty tree");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
pajoye Sat Apr 25 15:02:04 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- SEARCHPGM struct has to be freed
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.275&r2=1.276&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.275 php-src/ext/imap/php_imap.c:1.276
--- php-src/ext/imap/php_imap.c:1.275 Sat Apr 25 14:53:50 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:02:03 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.275 2009/04/25 14:53:50 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.276 2009/04/25 15:02:03 pajoye Exp $ */
#define IMAP41
@@ -3892,6 +3892,7 @@
char *search_criteria;
MESSAGELIST *cur;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "rs|ls", &streamind,
&criteria, &criteria_len, &flags, &charset, &charset_len) == FAILURE) {
return;
@@ -3902,7 +3903,14 @@
search_criteria = estrndup(criteria, criteria_len);
IMAPG(imap_messages) = IMAPG(imap_messages_tail) = NIL;
- mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset :
NIL), mail_criteria(search_criteria), flags);
+ pgm = mail_criteria(search_criteria);
+
+ mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset :
NIL), pgm, flags);
+
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
+
if (IMAPG(imap_messages) == NIL) {
efree(search_criteria);
RETURN_FALSE;
@@ -4508,6 +4516,7 @@
char criteria[] = "ALL";
THREADNODE *top;
int argc = ZEND_NUM_ARGS();
+ SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind, &flags) ==
FAILURE) {
return;
@@ -4515,7 +4524,11 @@
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap",
le_imap);
- top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL,
mail_criteria(criteria), flags);
+ pgm = mail_criteria(criteria);
+ top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, pgm,
flags);
+ if (pgm) {
+ mail_free_searchpgm(&pgm);
+ }
if(top == NIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function returned
an empty tree");
--
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/imap php_imap.c
pajoye Sat Apr 25 14:59:21 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- silent warning, NULL is not 0
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.33&r2=1.208.2.7.2.26.2.34&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.33
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.34
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.33 Sat Apr 25 11:21:14 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 14:59:21 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.33 2009/04/25 11:21:14 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.34 2009/04/25 14:59:21 pajoye Exp $ */
#define IMAP41
@@ -1204,7 +1204,7 @@
zval *streamind;
char *mailbox;
int mailbox_len;
- long options = NULL, retries = NULL;
+ long options = 0, retries = 0;
pils *imap_le_struct;
MAILSTREAM *imap_stream;
long flags=NIL;
@@ -2857,7 +2857,7 @@
zval *streamind;
char *sequence, *flag;
int sequence_len, flag_len;
- long flags = NULL;
+ long flags = 0;
pils *imap_le_struct;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|l",
&streamind, &sequence, &sequence_len, &flag, &flag_len, &flags) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
pajoye Sat Apr 25 14:53:50 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- silent warning, NULL is not 0
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.274&r2=1.275&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.274 php-src/ext/imap/php_imap.c:1.275
--- php-src/ext/imap/php_imap.c:1.274 Sat Apr 25 11:21:41 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 14:53:50 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.274 2009/04/25 11:21:41 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.275 2009/04/25 14:53:50 pajoye Exp $ */
#define IMAP41
@@ -1191,7 +1191,7 @@
zval *streamind;
char *mailbox;
int mailbox_len;
- long options = NULL, retries = NULL;
+ long options = 0, retries = 0;
pils *imap_le_struct;
MAILSTREAM *imap_stream;
long flags=NIL;
@@ -1561,7 +1561,7 @@
pils *imap_le_struct;
int msgindex, argc = ZEND_NUM_ARGS();
char *body;
- unsigned long body_len;
+ unsigned long body_len = 0;
if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &streamind, &msgno,
&flags) == FAILURE) {
return;
@@ -2845,7 +2845,7 @@
zval *streamind;
char *sequence, *flag;
int sequence_len, flag_len;
- long flags = NULL;
+ long flags = 0;
pils *imap_le_struct;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|l",
&streamind, &sequence, &sequence_len, &flag, &flag_len, &flags) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/testcase/preconditions rtIsSectionImplementedTest.php
zoe Sat Apr 25 14:32:44 2009 UTC
Modified files:
/phpruntests/tests/testcase/preconditions
rtIsSectionImplementedTest.php
Log:
Missing full stop in test
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/preconditions/rtIsSectionImplementedTest.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/tests/testcase/preconditions/rtIsSectionImplementedTest.php
diff -u
phpruntests/tests/testcase/preconditions/rtIsSectionImplementedTest.php:1.2
phpruntests/tests/testcase/preconditions/rtIsSectionImplementedTest.php:1.3
--- phpruntests/tests/testcase/preconditions/rtIsSectionImplementedTest.php:1.2
Fri Apr 24 09:42:02 2009
+++ phpruntests/tests/testcase/preconditions/rtIsSectionImplementedTest.php
Sat Apr 25 14:32:44 2009
@@ -18,7 +18,7 @@
$precondition = new rtIsSectionImplemented();
$test = array('UEXPECT', 'FILE');
-$this->assertEquals("The test contains a section which is not
implemented yet", trim($precondition->getMessage()));
+$this->assertEquals("The test contains a section which is not
implemented yet.", trim($precondition->getMessage()));
$this->assertFalse($precondition->isMet($test));
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src rtText.php
spriebsch Sat Apr 25 14:26:43 2009 UTC
Modified files:
/phpruntests/srcrtText.php
Log:
Added missing Docblock and added tags to conform with PEAR CS.
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtText.php?r1=1.4&r2=1.5&diff_format=u
Index: phpruntests/src/rtText.php
diff -u phpruntests/src/rtText.php:1.4 phpruntests/src/rtText.php:1.5
--- phpruntests/src/rtText.php:1.4 Fri Apr 24 08:52:21 2009
+++ phpruntests/src/rtText.php Sat Apr 25 14:26:43 2009
@@ -1,6 +1,29 @@
+ * @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
+ * @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 rtText
{
@@ -10,9 +33,10 @@
*
* @param string $name Text name to return
* @param array $replacements Placeholder replacements
+ *
* @return string
*/
-public static function get($name, array $replacements = array())
+public static function get($name, $replacements = array())
{
$filename = dirname(__FILE__) . '/texts/' . $name . '.txt';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/versioning php_sapi_name_variation001.phpt
Sebastian Schürmann kirjoitti: sebsSat Apr 25 11:33:26 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/versioning php_sapi_name_variation001.phpt Log: - Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt +++ php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt Why are you committing tests only to PHP_5_3 branch and not to HEAD / PHP_5_2 ? --Jani -- 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/standard/tests/versioning php_sapi_name_variation001.phpt
sebsSat Apr 25 11:33:26 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/versioning php_sapi_name_variation001.phpt Log: - Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt +++ php-src/ext/standard/tests/versioning/php_sapi_name_variation001.phpt -- 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) /tests/output ob_get_status.phpt
sebsSat Apr 25 11:31:29 2009 UTC Added files: (Branch: PHP_5_3) /php-src/tests/output ob_get_status.phpt Log: - Initial commit http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_get_status.phpt?view=markup&rev=1.1 Index: php-src/tests/output/ob_get_status.phpt +++ php-src/tests/output/ob_get_status.phpt -- 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/standard/tests/general_functions call_user_method.phpt
sebsSat Apr 25 11:29:52 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions call_user_method.phpt Log: - Initial Commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/call_user_method.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/call_user_method.phpt +++ php-src/ext/standard/tests/general_functions/call_user_method.phpt -- 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/standard/tests/strings strcoll.phpt
sebsSat Apr 25 11:23:01 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings strcoll.phpt Log: - Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strcoll.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/strcoll.phpt +++ php-src/ext/standard/tests/strings/strcoll.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
pajoye Sat Apr 25 11:21:41 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- bad idea to free body
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.273&r2=1.274&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.273 php-src/ext/imap/php_imap.c:1.274
--- php-src/ext/imap/php_imap.c:1.273 Thu Apr 23 22:24:54 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 11:21:41 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.273 2009/04/23 22:24:54 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.274 2009/04/25 11:21:41 pajoye Exp $ */
#define IMAP41
@@ -1594,7 +1594,6 @@
} else {
RETVAL_STRINGL(body, body_len, 1);
}
- free(body);
}
/* }}} */
--
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/imap php_imap.c
pajoye Sat Apr 25 11:21:15 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- bad idea to free body
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.32&r2=1.208.2.7.2.26.2.33&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.32
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.33
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.32 Thu Apr 23 22:25:13 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 11:21:14 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski|
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.32 2009/04/23 22:25:13 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.33 2009/04/25 11:21:14 pajoye Exp $ */
#define IMAP41
@@ -1608,7 +1608,6 @@
} else {
RETVAL_STRINGL(body, body_len, 1);
}
- free(body);
}
/* }}} */
--
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/spl/tests spl_classes.phpt
sebsSat Apr 25 11:19:40 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/spl/tests spl_classes.phpt Log: Initial commit http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_classes.phpt?view=markup&rev=1.1 Index: php-src/ext/spl/tests/spl_classes.phpt +++ php-src/ext/spl/tests/spl_classes.phpt -- 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) /tests/func ini_alter.phpt
sebsSat Apr 25 11:18:15 2009 UTC Added files: (Branch: PHP_5_3) /php-src/tests/func ini_alter.phpt Log: - initial ci - basic test for ini_alter http://cvs.php.net/viewvc.cgi/php-src/tests/func/ini_alter.phpt?view=markup&rev=1.1 Index: php-src/tests/func/ini_alter.phpt +++ php-src/tests/func/ini_alter.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
