cvs: pecl /htscanner htscanner.c package.xml

pajoye Mon Dec 18 01:07:08 2006 UTC Modified files: /pecl/htscanner htscanner.c package.xml Log: - unlock cache when an error occured in alter-ini and using a cached entry http://cvs.php.net/viewvc.cgi/pecl/htscanner/htscanner.c?r1=1.10&r2=1.11&diff_format=u Index: pecl/htscanner/htscanner.c diff -u pecl/htscanner/htscanner.c:1.10 pecl/htscanner/htscanner.c:1.11 --- pecl/htscanner/htscanner.c:1.10 Mon Dec 18 00:56:41 2006 +++ pecl/htscanner/htscanner.c Mon Dec 18 01:07:08 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: htscanner.c,v 1.10 2006/12/18 00:56:41 pajoye Exp $ */ +/* $Id: htscanner.c,v 1.11 2006/12/18 01:07:08 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -375,6 +375,7 @@ if (zend_alter_ini_entry(name, len, value, strlen(value), PHP_INI_PERDIR, PHP_INI_STAGE_RUNTIME) == FAILURE) { zend_error(E_ERROR, "Adding option from cache (Name: '%s' Value: '%s') failed!\n", name, value); + htscannerMutexUnlock(ini_entries_cache_mutex); return FAILURE; } zend_hash_move_forward_ex(entry_fetched->ini_entries, &pos); @@ -430,7 +431,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "htscanner support", "enabled"); - php_info_print_table_row(2, "Extension Version","$Id: htscanner.c,v 1.10 2006/12/18 00:56:41 pajoye Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: htscanner.c,v 1.11 2006/12/18 01:07:08 pajoye Exp $"); php_info_print_table_row(2, "htaccess version", "@PACKAGE_VERSION@"); php_info_print_table_end(); http://cvs.php.net/viewvc.cgi/pecl/htscanner/package.xml?r1=1.7&r2=1.8&diff_format=u Index: pecl/htscanner/package.xml diff -u pecl/htscanner/package.xml:1.7 pecl/htscanner/package.xml:1.8 --- pecl/htscanner/package.xml:1.7 Mon Dec 18 00:56:41 2006 +++ pecl/htscanner/package.xml Mon Dec 18 01:07:08 2006 @@ -25,7 +25,8 @@ </stability> <license uri="http://www.php.net/license">PHP License</license> <notes>- Removed invalid zend_hash_destroy in mshutdown -- Added an error message when no path translated has been found</notes> +- Added an error message when no path translated has been found +- Unlock the cache when an error occured in alter_ini and using a cached entry</notes> <contents> <dir name="/"> <file name="config.m4" role="src"/>