nlopess Thu Aug 7 12:51:05 2008 UTC
Modified files:
/php-src/ext/standard browscap.c
Log:
MFB: upgrade to PCRE
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.99&r2=1.100&diff_format=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.99
php-src/ext/standard/browscap.c:1.100
--- php-src/ext/standard/browscap.c:1.99 Thu Jul 24 19:50:23 2008
+++ php-src/ext/standard/browscap.c Thu Aug 7 12:51:05 2008
@@ -16,13 +16,13 @@
+----------------------------------------------------------------------+
*/
-/* $Id: browscap.c,v 1.99 2008/07/24 19:50:23 felipe Exp $ */
+/* $Id: browscap.c,v 1.100 2008/08/07 12:51:05 nlopess Exp $ */
#include "php.h"
#include "php_browscap.h"
#include "php_ini.h"
#include "php_string.h"
-#include "ext/ereg/php_regex.h"
+#include "ext/pcre/php_pcre.h"
#include "zend_ini_scanner.h"
#include "zend_globals.h"
@@ -51,16 +51,17 @@
static void convert_browscap_pattern(zval *pattern) /* {{{ */
{
- register int i, j;
+ int i, j=0;
char *t;
php_strtolower(Z_STRVAL_P(pattern), Z_STRLEN_P(pattern));
- t = (char *) safe_pemalloc(Z_STRLEN_P(pattern), 2, 3, 1);
+ t = (char *) safe_pemalloc(Z_STRLEN_P(pattern), 2, 5, 1);
- t[0] = '^';
+ t[j++] = '§';
+ t[j++] = '^';
- for (i=0, j=1; i<Z_STRLEN_P(pattern); i++, j++) {
+ for (i=0; i<Z_STRLEN_P(pattern); i++, j++) {
switch (Z_STRVAL_P(pattern)[i]) {
case '?':
t[j] = '.';
@@ -73,6 +74,22 @@
t[j++] = '\\';
t[j] = '.';
break;
+ case '\\':
+ t[j++] = '\\';
+ t[j] = '\\';
+ break;
+ case '(':
+ t[j++] = '\\';
+ t[j] = '(';
+ break;
+ case ')':
+ t[j++] = '\\';
+ t[j] = ')';
+ break;
+ case '§':
+ t[j++] = '\\';
+ t[j] = '§';
+ break;
default:
t[j] = Z_STRVAL_P(pattern)[i];
break;
@@ -80,6 +97,7 @@
}
t[j++] = '$';
+ t[j++] = '§';
t[j]=0;
Z_STRVAL_P(pattern) = t;
@@ -215,8 +233,11 @@
static int browser_reg_compare(zval **browser TSRMLS_DC, int num_args, va_list
args, zend_hash_key *key) /* {{{ */
{
zval **browser_regex, **previous_match;
- regex_t r;
+ pcre *re;
+ int re_options;
+ pcre_extra *re_extra;
char *lookup_browser_name = va_arg(args, char *);
+ int lookup_browser_length = va_arg(args, int);
zval **found_browser_entry = va_arg(args, zval **);
/* See if we have an exact match, if so, we're done... */
@@ -233,10 +254,12 @@
return 0;
}
- if (regcomp(&r, Z_STRVAL_PP(browser_regex), REG_NOSUB) != 0) {
+ re = pcre_get_compiled_regex(Z_STRVAL_PP(browser_regex), &re_extra,
&re_options TSRMLS_CC);
+ if (re == NULL) {
return 0;
}
- if (regexec(&r, lookup_browser_name, 0, NULL, 0) == 0) {
+
+ if (pcre_exec(re, re_extra, lookup_browser_name, lookup_browser_length,
0, re_options, NULL, 0) == 0) {
/* If we've found a possible browser, we need to do a
comparison of the
number of characters changed in the user agent being checked
versus
the previous match found and the current match. */
@@ -245,11 +268,10 @@
zval **current_match;
if (zend_hash_find(Z_ARRVAL_PP(browser),
"browser_name_pattern", sizeof("browser_name_pattern"), (void**)
¤t_match) == FAILURE) {
- regfree(&r);
return 0;
}
- ua_len = strlen(lookup_browser_name);
+ ua_len = lookup_browser_length;
for (i = 0; i < Z_STRLEN_PP(previous_match); i++) {
switch (Z_STRVAL_PP(previous_match)[i]) {
@@ -286,10 +308,6 @@
}
}
- if (&r) {
- regfree(&r);
- }
-
return 0;
}
/* }}} */
@@ -329,7 +347,7 @@
if (zend_hash_find(&browser_hash, lookup_browser_name, agent_name_len +
1, (void **) &agent) == FAILURE) {
found_browser_entry = NULL;
- zend_hash_apply_with_arguments(&browser_hash TSRMLS_CC,
(apply_func_args_t) browser_reg_compare, 2, lookup_browser_name,
&found_browser_entry);
+ zend_hash_apply_with_arguments(&browser_hash TSRMLS_CC,
(apply_func_args_t) browser_reg_compare, 3, lookup_browser_name,
agent_name_len, &found_browser_entry);
if (found_browser_entry) {
agent = &found_browser_entry;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
