[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] cvs: pecl /htscanner README htscanner.c package.xml
From:       "Pierre-Alain Joye" <pajoye () php ! net>
Date:       2006-12-30 15:14:57
Message-ID: cvspajoye1167491697 () cvsserver
[Download RAW message or body]

pajoye		Sat Dec 30 15:14:57 2006 UTC

  Modified files:              
    /pecl/htscanner	htscanner.c package.xml README 
  Log:
  - make None value case insensitive
  - #9672, wrong ini value lenght
  - add a TODO section to README
  
  
http://cvs.php.net/viewvc.cgi/pecl/htscanner/htscanner.c?r1=1.11&r2=1.12&diff_format=u
                
Index: pecl/htscanner/htscanner.c
diff -u pecl/htscanner/htscanner.c:1.11 pecl/htscanner/htscanner.c:1.12
--- pecl/htscanner/htscanner.c:1.11	Mon Dec 18 01:07:08 2006
+++ pecl/htscanner/htscanner.c	Sat Dec 30 15:14:56 2006
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: htscanner.c,v 1.11 2006/12/18 01:07:08 pajoye Exp $ */
+/* $Id: htscanner.c,v 1.12 2006/12/30 15:14:56 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -34,8 +34,8 @@
 ZEND_DECLARE_MODULE_GLOBALS(htscanner)
 
 #define FILE_BUFFER 1000
-#define HTSCANNER_DEBUG 0 
-#define HTSCANNER_ENABLE_CACHE 1 
+#define HTSCANNER_DEBUG 1 
+#define HTSCANNER_ENABLE_CACHE 0 
 
 #if HTSCANNER_DEBUG
 static void htscanner_debug(char *format, ...) /* {{{ */
@@ -98,8 +98,10 @@
 		PHP_HTSCANNER_LTRIM(value);
 		if (len > 2 && value[len - 2] == '\r') {
 			value[len - 2] = 0;
+			len -= 2;
 		} else {
 			value[len - 1] = 0;
+			len--;
 		}
 
 		if (flag) {
@@ -109,10 +111,12 @@
 			} else {
 				value = "0";
 			}
+			len = 1;
 		} else {
 			/* it's a value */
 			if (!strncasecmp(value, "none", sizeof("none"))) {
 				value = "";
+				len = 0;
 			}
 		}
 
@@ -147,9 +151,9 @@
 			}
 		}
 
-		if (zend_alter_ini_entry(name, name_len + 1, value, len + 1,
+		if (zend_alter_ini_entry(name, name_len + 1, value, len,
 					status, PHP_INI_STAGE_RUNTIME) == FAILURE) {
-			zend_error(E_ERROR, "Adding option (Name: %s Value: %s) failed!\n", name, value);
+			zend_error(E_WARNING, "Adding option (Name: %s Value: %s) (%i, %i) failed!\n", \
name, value, name_len, len);  return;
 		}
 #if HTSCANNER_ENABLE_CACHE
@@ -337,7 +341,7 @@
 	   initialized. Get it from path_translated.
 	*/
 	if (!SG(request_info).path_translated) {
-		zend_error(E_ERROR, "No path translated, cannot determine the current script\n");
+		zend_error(E_WARNING, "No path translated, cannot determine the current \
script\n");  return FAILURE;
 	}
 
@@ -431,7 +435,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.11 \
2006/12/18 01:07:08 pajoye Exp $"); +    php_info_print_table_row(2, "Extension \
Version","$Id: htscanner.c,v 1.12 2006/12/30 15:14:56 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.8&r2=1.9&diff_format=u
Index: pecl/htscanner/package.xml
diff -u pecl/htscanner/package.xml:1.8 pecl/htscanner/package.xml:1.9
--- pecl/htscanner/package.xml:1.8	Mon Dec 18 01:07:08 2006
+++ pecl/htscanner/package.xml	Sat Dec 30 15:14:56 2006
@@ -16,7 +16,7 @@
   </lead>
   <date>2006-12-18</date>
   <version>
-    <release>0.6.2</release>
+    <release>0.6.3</release>
     <api>0.6.0</api>
   </version>
   <stability>
@@ -24,9 +24,9 @@
     <api>alpha</api>
   </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
-- Unlock the cache when an error occured in alter_ini and using a cached \
entry</notes> +  <notes>- #9672, erroneous ini value length 
+- Replace request and module init fatal errors by warnings 
+- The None value is now case insentive, like in php.ini</notes>
   <contents>
     <dir name="/">
       <file name="config.m4" role="src"/>
@@ -55,6 +55,23 @@
   <extsrcrelease/>
   <changelog>
 <release>
+  <date>2006-12-18</date>
+  <version>
+    <release>0.6.2</release>
+    <api>0.6.0</api>
+  </version>
+  <stability>
+    <release>alpha</release>
+    <api>alpha</api>
+  </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
+- Unlock the cache when an error occured in alter_ini and using a cached \
entry</notes> +  <contents>
+
+</release>
+<release>
   <date>2006-12-13</date>
   <version>
     <release>0.6.1</release>
http://cvs.php.net/viewvc.cgi/pecl/htscanner/README?r1=1.2&r2=1.3&diff_format=u
Index: pecl/htscanner/README
diff -u pecl/htscanner/README:1.2 pecl/htscanner/README:1.3
--- pecl/htscanner/README:1.2	Wed Dec 20 20:13:53 2006
+++ pecl/htscanner/README	Sat Dec 30 15:14:56 2006
@@ -52,6 +52,11 @@
  AP_INIT_RAW_ARGS("<Directory", dirsection, NULL, RSRC_CONF,
 ===
 
+TODO:
+- add configure option to disable all init error messages (useful if one uses one \
php.ini for +  both cli and cgi, having htscanner loaded in CLI)
+- complete/define the needs for a php4 patch (assigned to Eugeny Zadevalov) 
+
 
 Changelog:
 ----------

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


[prev in list] [next in list] [prev in thread] [next in thread]