cvs: php4 /main configuration-parser.y

stas Tue Jul 25 11:50:50 2000 EDT Modified files: /php4/main configuration-parser.y Log: Make browscap parameter names lowercase Fix . handling in browscap names Index: php4/main/configuration-parser.y diff -u php4/main/configuration-parser.y:1.52 php4/main/configuration-parser.y:1.53 --- php4/main/configuration-parser.y:1.52 Sun Jul 23 04:27:48 2000 +++ php4/main/configuration-parser.y Tue Jul 25 11:50:50 2000 @@ -19,7 +19,7 @@ -/* $Id: configuration-parser.y,v 1.52 2000/07/23 11:27:48 stas Exp $ */ +/* $Id: configuration-parser.y,v 1.53 2000/07/25 18:50:50 stas Exp $ */ #define DEBUG_CFG_PARSER 0 #include "php.h" @@ -324,13 +324,14 @@ char *t; for (i=0; i<pattern->value.str.len; i++) { - if (pattern->value.str.val[i]=='*' || pattern->value.str.val[i]=='?') { + if (pattern->value.str.val[i]=='*' || pattern->value.str.val[i]=='?' || pattern->value.str.val[i]=='.') { break; } } if (i==pattern->value.str.len) { /* no wildcards */ pattern->value.str.val = zend_strndup(pattern->value.str.val, pattern->value.str.len); + return; } t = (char *) malloc(pattern->value.str.len*2); @@ -457,14 +458,18 @@ case PARSING_MODE_BROWSCAP: if (current_section) { zval *new_property; + char *new_key; new_property = (zval *) malloc(sizeof(zval)); INIT_PZVAL(new_property); new_property->value.str.val = $3.value.str.val; new_property->value.str.len = $3.value.str.len; new_property->type = IS_STRING; - /* zend_str_tolower(new_property->value.str.val, new_property->value.str.len); */ - zend_hash_update(current_section->value.obj.properties, $1.value.str.val, $1.value.str.len+1, &new_property, sizeof(zval *), NULL); + + new_key = zend_strndup($1.value.str.val, $1.value.str.len); + zend_str_tolower(new_key,$1.value.str.len); + zend_hash_update(current_section->value.obj.properties, new_key, $1.value.str.len+1, &new_property, sizeof(zval *), NULL); + free(new_key); } break; case PARSING_MODE_STANDALONE: {