clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make get_browser() try harder to find better matches.

Browse Source
This commit is contained in:
Jay Smith 2003-05-20 17:59:16 +00:00
parent 53c90b2344
commit 515f0e3f71
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/standard/browscap.c
View File

@ -186,19 +186,29 @@ PHP_MSHUTDOWN_FUNCTION(browscap)
*/
static int browser_reg_compare(zval **browser, int num_args, va_list args, zend_hash_key *key)
{
zval **browser_name;
zval **browser_name, **current;
regex_t r;
char *lookup_browser_name = va_arg(args, char *);
zval **found_browser_entry = va_arg(args, zval **);
if (*found_browser_entry) { /* already found */
return 0;
}
if (zend_hash_find(Z_ARRVAL_PP(browser), "browser_name_regex", sizeof("browser_name_regex"), (void **) &browser_name) == FAILURE) {
return 0;
}
if (Z_STRVAL_PP(browser_name)[0] != '^') {
return 0;
if (*found_browser_entry) {
/* We've already found it, so don't compare to the default browser,
because it will match anything. */
if (!strcmp(Z_STRVAL_PP(browser_name), "^.*$")) {
return 0;
}
/* If we've found a possible browser, check it's length. Longer user
agent strings are assumed to be more precise, so use them. */
else if (zend_hash_find(Z_ARRVAL_PP(found_browser_entry), "browser_name_regex", sizeof("browser_name_regex"), (void**) &current) == FAILURE) {
return 0;
}
else if (Z_STRLEN_PP(current) > Z_STRLEN_PP(browser_name)) {
return 0;
}
}
if (regcomp(&r, Z_STRVAL_PP(browser_name), REG_NOSUB)!=0) {
return 0;