[PHP-CVS] svn: /php/php-src/trunk/ Zend/zend_API.c Zend/zend_API.h main/main.c

[Dmitry Stogov]

dmitry   Fri, 15 Oct 2010 07:30:24 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=304408

Log:
zend_collect_module_handlers() has to be called after zend_extensions startup, 
because they can register additional 'hidden' extensions

Changed paths:
U   php/php-src/trunk/Zend/zend_API.c
U   php/php-src/trunk/Zend/zend_API.h
U   php/php-src/trunk/main/main.c

Modified: php/php-src/trunk/Zend/zend_API.c
===
--- php/php-src/trunk/Zend/zend_API.c   2010-10-14 21:33:10 UTC (rev 304407)
+++ php/php-src/trunk/Zend/zend_API.c   2010-10-15 07:30:24 UTC (rev 304408)
@@ -1688,7 +1688,7 @@
 }
 /* }}} */

-static void zend_collect_module_handlers(TSRMLS_D) /* {{{ */
+ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */
 {
HashPosition pos;
zend_module_entry *module;
@@ -1770,7 +1770,6 @@
 {
zend_hash_sort(module_registry, zend_sort_modules, NULL, 0 TSRMLS_CC);
zend_hash_apply(module_registry, (apply_func_t)zend_startup_module_ex 
TSRMLS_CC);
-   zend_collect_module_handlers(TSRMLS_C);
return SUCCESS;
 }
 /* }}} */

Modified: php/php-src/trunk/Zend/zend_API.h
===
--- php/php-src/trunk/Zend/zend_API.h   2010-10-14 21:33:10 UTC (rev 304407)
+++ php/php-src/trunk/Zend/zend_API.h   2010-10-15 07:30:24 UTC (rev 304408)
@@ -260,6 +260,7 @@
 ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module 
TSRMLS_DC);
 ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC);
 ZEND_API int zend_startup_modules(TSRMLS_D);
+ZEND_API void zend_collect_module_handlers(TSRMLS_D);
 ZEND_API void zend_destroy_modules(void);
 ZEND_API void zend_check_magic_method_implementation(const zend_class_entry 
*ce, const zend_function *fptr, int error_type TSRMLS_DC);


Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c   2010-10-14 21:33:10 UTC (rev 304407)
+++ php/php-src/trunk/main/main.c   2010-10-15 07:30:24 UTC (rev 304408)
@@ -2059,6 +2059,8 @@
/* start Zend extensions */
zend_startup_extensions();

+   zend_collect_module_handlers(TSRMLS_C);
+
/* register additional functions */
if (sapi_module.additional_functions) {
if (zend_hash_find(module_registry, standard, 
sizeof(standard), (void**)module)==SUCCESS) {

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

[PHP-CVS] svn: /php/php-src/trunk/ run-tests.php

[Derick Rethans]

derick   Fri, 15 Oct 2010 12:56:45 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=304415

Log:
- Added the writing of .sh files so that we can run the tests (including all
  INI settings) in one go.

Changed paths:
U   php/php-src/trunk/run-tests.php

Modified: php/php-src/trunk/run-tests.php
===
--- php/php-src/trunk/run-tests.php 2010-10-15 12:50:56 UTC (rev 304414)
+++ php/php-src/trunk/run-tests.php 2010-10-15 12:56:45 UTC (rev 304415)
@@ -197,7 +197,7 @@
 if (getenv('TEST_PHP_LOG_FORMAT')) {
$log_format = strtoupper(getenv('TEST_PHP_LOG_FORMAT'));
 } else {
-   $log_format = 'LEOD';
+   $log_format = 'LEODS';
 }

 // Check whether a detailed log is wanted.
@@ -1352,6 +1352,7 @@
$exp_filename  = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'exp';
$output_filename   = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'out';
$memcheck_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'mem';
+   $sh_filename   = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'sh';
$temp_file = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'php';
$test_file = $test_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'php';
$temp_skipif   = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'skip.php';
@@ -1382,6 +1383,7 @@
'exp'  = $exp_filename,
'out'  = $output_filename,
'mem'  = $memcheck_filename,
+   'sh'   = $sh_filename,
'php'  = $temp_file,
'skip' = $temp_skipif,
'clean'= $temp_clean);
@@ -1398,6 +1400,7 @@
@unlink($exp_filename);
@unlink($output_filename);
@unlink($memcheck_filename);
+   @unlink($sh_filename);
@unlink($temp_file);
@unlink($test_file);
@unlink($temp_skipif);
@@ -1959,6 +1962,15 @@
error(Cannot create test diff - $diff_filename);
}

+   // write .sh
+   if (strpos($log_format, 'S') !== false  
file_put_contents($sh_filename, b#!/bin/sh
+
+{$cmd}
+, FILE_BINARY) === false) {
+   error(Cannot create test shell script - $sh_filename);
+   }
+   chmod($sh_filename, 0755);
+
// write .log
if (strpos($log_format, 'L') !== false  
file_put_contents($log_filename, b
  EXPECTED OUTPUT

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Gustavo André dos Santos Lopes]

cataphract   Fri, 15 Oct 2010 23:54:24 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=304440

Log:
- Updated NEWS to note fix of bug #53006 now that it's confirmed it's fixed.

Bug: http://bugs.php.net/53006 (Closed) stream_get_contents offset max is 1165
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-10-15 20:18:18 UTC (rev 304439)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-10-15 23:54:24 UTC (rev 304440)
@@ -36,6 +36,8 @@
 - Fixed htmlentities/htmlspecialchars accepting certain ill-formed UTF-8
   sequences. (Gustavo)

+- Fixed bug #53006 (stream_get_contents has an unpredictable behavior when the
+  underlying stream does not support seeking). (Gustavo)
 - Fixed bug #53021 (In html_entity_decode, failure to convert numeric entities
   with ENT_NOQUOTES and ISO-8859-1). Fixed and extended the fix of ENT_NOQUOTES
   in html_entity_decode that had introduced the bug (rev #185591) to other

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