X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_strlist.c;h=3a52f3bd9f816c2c199ea258573d158a4ecebe2d;hp=ee46786e84f705511308250039126a5e9857854b;hb=8191c55421fb6ecc86185608a8b0510da1525e1e;hpb=8d05291f42b3b42159b3fe91492aa4862f3d4405

diff --git a/php_http_strlist.c b/php_http_strlist.c
index ee46786..3a52f3b 100644
--- a/php_http_strlist.c
+++ b/php_http_strlist.c
@@ -10,7 +10,7 @@
     +--------------------------------------------------------------------+
 */
 
-#include "php_http.h"
+#include "php_http_api.h"
 
 PHP_HTTP_API php_http_strlist_iterator_t *php_http_strlist_iterator_init(php_http_strlist_iterator_t *iter, const char list[], unsigned factor)
 {
@@ -28,7 +28,7 @@ PHP_HTTP_API php_http_strlist_iterator_t *php_http_strlist_iterator_init(php_htt
 PHP_HTTP_API const char *php_http_strlist_iterator_this(php_http_strlist_iterator_t *iter, unsigned *id)
 {
 	if (id) {
-		*id = iter->major * iter->factor + iter->minor;
+		*id = (iter->major + 1) * iter->factor + iter->minor;
 	}
 
 	return iter->p;
@@ -46,6 +46,7 @@ PHP_HTTP_API const char *php_http_strlist_iterator_next(php_http_strlist_iterato
 		if (!*iter->p) {
 			++iter->p;
 			++iter->major;
+			iter->minor = 0;
 		}
 	}