Commit Graph

119 Commits

Author SHA1 Message Date
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Johannes Schlüter
5e23a047ac Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove extra ;
2012-06-22 17:33:22 +02:00
Johannes Schlüter
a62d4e2c43 Remove extra ; 2012-06-22 17:32:46 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Gustavo André dos Santos Lopes
479a47d8af Merge of fix for bug #54918 (r311745, scottmac) to 5.3. 2011-06-03 09:39:45 +00:00
Scott MacVicar
0c107d3bf3 Fix Bug #54918 - Crash when there is a failure to read the browscap file 2011-06-03 00:42:07 +00:00
Gustavo André dos Santos Lopes
7af15a41d9 - Fixed double registering of browscap ini directive. See bug #54896. 2011-06-02 08:46:40 +00:00
Gustavo André dos Santos Lopes
ce966baaa4 - Fixed double registering of browscap ini directive. See bug #54896. 2011-06-02 08:46:40 +00:00
Antony Dovgal
f3cd7fdda4 fix ZTS build for 5_3, too 2011-05-01 19:46:27 +00:00
Felipe Pena
48cb3447bb - Fixed ZTS build 2011-05-01 19:22:24 +00:00
Gustavo André dos Santos Lopes
a2e0e2564d - Fixed bug #54580 (get_browser() segmentation fault when the browscap ini
directive is set in activation time). This commit fixes this by adding a per
  request parsing of the browscap file that's when get_browser is called the
  first time and the directive is set on activation time.w
2011-05-01 18:37:20 +00:00
Gustavo André dos Santos Lopes
6d9d7af86f - Fixed bug #54580 (get_browser() segmentation fault when the browscap ini
directive is set in activation time). This commit fixes this by adding a per
  request parsing of the browscap file that's when get_browser is called the
  first time and the directive is set on activation time.w
2011-05-01 18:37:20 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Jani Taskinen
ebc1b9f13d Fixed bug #50267 (get_browser(null) does not use HTTP_USER_AGENT) 2009-11-24 00:18:16 +00:00
Matt Wilmas
1fa3b21c15 MFH: Fixed error message grammar:
- "cannot" instead of "can not" (meaning "also can")
 - "than" instead of "then" (Hint: "then" should hardly be needed;
     you're not telling the order in which to do something)

... plus removed a couple ending. dots
2009-06-06 02:40:49 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Arnaud Le Blanc
d69dfa4b9f MFH: initialize optional vars 2008-10-21 22:08:38 +00:00
Antony Dovgal
740ba5ac0a MFH: fix get_browser() (broken in the process of param API conversion) 2008-08-29 14:14:09 +00:00
Antony Dovgal
9453a9213c MFH: fix memleak in browscap code (noticed by Gopal) 2008-08-19 15:16:33 +00:00
Nuno Lopes
a8ec29310f upgrade to PCRE (i.e. get ride of ereg usage) 2008-08-07 12:50:17 +00:00
Felipe Pena
0fbe6a0c14 - MFH: Added TSRMLS_DC to apply_func_args_t and zend_hash_apply_with_arguments. 2008-07-24 19:52:24 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Jani Taskinen
2501a172fc MFH 2007-11-05 12:27:42 +00:00
Jani Taskinen
aa3eee1dce MFH:- Moved the old regex functions to own extension: ereg 2007-10-05 15:00:09 +00:00
Jani Taskinen
6723ed1db3 MFH: Nuked ending dots from error messages 2007-09-30 05:49:45 +00:00
Jani Taskinen
09b6f37f20 MFH:
- Added ".htaccess" style user-defined php.ini files support for
  CGI/FastCGI.
- Added support for special [PATH=/opt/httpd/www.example.com/] sections
  in php.ini. All directives set in these sections will not be able to be
  overridden in user-defined ini-files or during runtime in the specified
  path.

- Improved php.ini handling:
  . Added better error reporting for syntax errors in php.ini files
  . Allowed "ini-variables" to be used almost everywhere ini php.ini files
  . Allowed using alphanumeric/variable indexes in "array" ini options
  . Fixed get_cfg_var() to be able to return "array" ini options

- Fixed bug #27372 (parse error loading browscap.ini at apache startup)
- Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
  characters)
2007-09-28 02:05:10 +00:00
Ilia Alshanetsky
4a614cd6b1 malloc() -> pemalloc() 2007-03-07 00:52:40 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal
8854c3d51a MFH 2006-12-21 21:37:45 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
d0a54af4c5 MFH: Nuke php3 legacy 2005-12-05 22:54:01 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Andrei Zmievski
9ab8deb33c Don't depend on empty_string. 2005-01-25 23:58:22 +00:00
Andrei Zmievski
27b1a27faf MFB (Fix several egregious leaks in ext/browscap and sapi/embed). 2005-01-25 21:33:58 +00:00
Jay Smith
83b2d923f8 Fixed bug #27291 (get_browser matches browscap.ini patterns incorrectly). 2004-03-15 21:26:39 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Uwe Schindler
ae4e11d861 MFB 2003-12-04 09:00:24 +00:00
Wez Furlong
1e679b02fe It's boolean, not long.
# fixes a warning under vc7
2003-08-13 22:31:22 +00:00
Shane Caraveo
d6ee8bab7f fix a crash I run into on occasion 2003-06-30 20:31:57 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Jay Smith
a79c751ae2 Relying on longer matches seems to work better than
matching the whole string with ^...$.
2003-05-30 19:06:34 +00:00
foobar
3c2f9fd5c0 MFB: php_error_docref -> zend_error (MINIT) 2003-05-27 17:24:59 +00:00
Jay Smith
515f0e3f71 Make get_browser() try harder to find better matches. 2003-05-20 17:59:16 +00:00
Ilia Alshanetsky
7e2a99d091 Fixed bug #23657 (Missing initialization in browscap module init) 2003-05-16 15:13:47 +00:00
Moriyoshi Koizumi
29f346d7d7 Removed redundant TSRMLS_FETCH's 2003-05-07 17:40:46 +00:00
Jay Smith
ab1124b014 A few fixes Uwe suggested, plus plugged a memleak and a possible
overrun.
2003-04-28 21:49:47 +00:00
Jay Smith
c0d1508ec8 get_browser() needs to use zend_is_auto_global() on _SERVER. 2003-03-18 21:49:01 +00:00