[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard browscap.c

2003-05-27 Thread Jani Taskinen 
sniper  Tue May 27 13:24:09 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  browscap.c 
  Log:
  There is no point using php_error_docref in MINIT.
  
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.60.2.10 php4/ext/standard/browscap.c:1.60.2.11
--- php4/ext/standard/browscap.c:1.60.2.10  Wed May 21 05:34:12 2003
+++ php4/ext/standard/browscap.cTue May 27 13:24:09 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: browscap.c,v 1.60.2.10 2003/05/21 09:34:12 zeev Exp $ */
+/* $Id: browscap.c,v 1.60.2.11 2003/05/27 17:24:09 sniper Exp $ */
 
 #include php.h
 #include php_regex.h
@@ -160,7 +160,7 @@
fh.opened_path = NULL;
fh.free_filename = 0;
if (!fh.handle.fp) {
-   php_error_docref(NULL TSRMLS_CC, E_CORE_WARNING, Cannot open 
'%s' for reading, browscap);
+   zend_error(E_CORE_WARNING, Cannot open '%s' for reading, 
browscap);
return FAILURE;
}
fh.filename = browscap;



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard browscap.c

2003-01-06 Thread Ilia Alshanetsky 
iliaa   Mon Jan  6 16:43:50 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  browscap.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.60.2.5 php4/ext/standard/browscap.c:1.60.2.6
--- php4/ext/standard/browscap.c:1.60.2.5   Sat Jan  4 14:51:13 2003
+++ php4/ext/standard/browscap.cMon Jan  6 16:43:50 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: browscap.c,v 1.60.2.5 2003/01/04 19:51:13 helly Exp $ */
+/* $Id: browscap.c,v 1.60.2.6 2003/01/06 21:43:50 iliaa Exp $ */
 
 #include php.h
 #include php_regex.h
@@ -200,10 +200,6 @@
return 0;
}
if(zend_hash_find(Z_OBJPROP_PP(browser), browser_name_pattern, 
sizeof(browser_name_pattern), (void **) browser_name) == FAILURE) {
-   return 0;
-   }
-
-   if (!strchr(Z_STRVAL_PP(browser_name),'*')) {
return 0;
}
if (regcomp(r, Z_STRVAL_PP(browser_name), REG_NOSUB)!=0) {



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard browscap.c

2003-01-04 Thread Marcus Boerger 
helly   Sat Jan  4 14:51:13 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  browscap.c 
  Log:
  Fix ZTS-ZE2 (After Cygwin now for the rest)
  
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.60.2.4 php4/ext/standard/browscap.c:1.60.2.5
--- php4/ext/standard/browscap.c:1.60.2.4   Sat Jan  4 14:42:24 2003
+++ php4/ext/standard/browscap.cSat Jan  4 14:51:13 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: browscap.c,v 1.60.2.4 2003/01/04 19:42:24 helly Exp $ */
+/* $Id: browscap.c,v 1.60.2.5 2003/01/04 19:51:13 helly Exp $ */
 
 #include php.h
 #include php_regex.h
@@ -189,12 +189,12 @@
  */
 static int browser_reg_compare(zval **browser, int num_args, va_list args, 
zend_hash_key *key)
 {
-   TSRMLS_FETCH();
-
zval **browser_name;
regex_t r;
char *lookup_browser_name = va_arg(args, char *);
zval **found_browser_entry = va_arg(args, zval **);
+
+   TSRMLS_FETCH();
 
if (*found_browser_entry) { /* already found */
return 0;



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard browscap.c

2002-11-17 Thread Ilia Alshanetsky 
iliaa   Sun Nov 17 22:16:46 2002 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  browscap.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.60 php4/ext/standard/browscap.c:1.60.2.1
--- php4/ext/standard/browscap.c:1.60   Mon Oct 14 14:13:18 2002
+++ php4/ext/standard/browscap.cSun Nov 17 22:16:45 2002
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: browscap.c,v 1.60 2002/10/14 18:13:18 iliaa Exp $ */
+/* $Id: browscap.c,v 1.60.2.1 2002/11/18 03:16:45 iliaa Exp $ */
 
 #include php.h
 #include php_regex.h
@@ -58,7 +58,7 @@
return;
}
 
-   t = (char *) malloc(Z_STRLEN_P(pattern)*2);
+   t = (char *) malloc(Z_STRLEN_P(pattern)*2 + 1);

for (i=0, j=0; iZ_STRLEN_P(pattern); i++, j++) {
switch (Z_STRVAL_P(pattern)[i]) {
@@ -78,6 +78,11 @@
break;
}
}
+   
+   if (j  (t[j-1] == '.')) {
+   t[j++] = '*';
+   }
+   
t[j]=0;
Z_STRVAL_P(pattern) = t;
Z_STRLEN_P(pattern) = j;



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard browscap.c

2002-11-17 Thread Jani Taskinen 
sniper  Sun Nov 17 22:24:33 2002 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  browscap.c 
  Log:
  MFH: Added error message if browscap location is not set in php.ini
  
  
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.60.2.1 php4/ext/standard/browscap.c:1.60.2.2
--- php4/ext/standard/browscap.c:1.60.2.1   Sun Nov 17 22:16:45 2002
+++ php4/ext/standard/browscap.cSun Nov 17 22:24:33 2002
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: browscap.c,v 1.60.2.1 2002/11/18 03:16:45 iliaa Exp $ */
+/* $Id: browscap.c,v 1.60.2.2 2002/11/18 03:24:33 sniper Exp $ */
 
 #include php.h
 #include php_regex.h
@@ -220,6 +220,7 @@
char *lookup_browser_name;
 
if (!INI_STR(browscap)) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, browscap ini directive 
+not set.);
RETURN_FALSE;
}




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