Commit graph

281 commits

Author SHA1 Message Date
Xinchen Hui
9714ceb92b Merge branch 'PHP-5.4' 2012-10-18 20:14:54 +08:00
Xinchen Hui
f1478bbf9d Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 20:13:36 +08:00
Xinchen Hui
db2dc7a6a4 indent 2012-10-18 20:13:14 +08:00
Xinchen Hui
84efca62ff Merge branch 'PHP-5.4' 2012-10-18 20:12:00 +08:00
Xinchen Hui
1f8fd609b0 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 20:11:32 +08:00
Xinchen Hui
e88cdaa014 better fix for #63055 2012-10-18 20:10:35 +08:00
Xinchen Hui
4eece4c86a Merge branch 'PHP-5.4' 2012-10-18 17:35:29 +08:00
Xinchen Hui
54cef2bb6d Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 17:33:52 +08:00
Xinchen Hui
8bd5e15ff7 Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite) 2012-10-18 17:31:27 +08:00
Stanislav Malyshev
ab566a9712 Merge branch 'PHP-5.4'
* PHP-5.4:
  fix bug #55856: preg_replace should fail on trailing garbage
  Bug #62956: fixing private method signature validation
  NEWS for 886a50a
2012-08-28 22:02:15 -07:00
Stanislav Malyshev
8b3c1a380a fix bug #55856: preg_replace should fail on trailing garbage 2012-08-28 21:59:20 -07:00
Nikita Popov
be202d3d35 Deprecate /e modifier
See https://wiki.php.net/rfc/remove_preg_replace_eval_modifier.
2012-03-04 13:39:12 +00:00
Rasmus Lerdorf
4ecfa5abf5 Safer way to call pcre_fullinfo - bug 60986 2012-02-06 18:18:53 +00:00
Rasmus Lerdorf
c950030b3f Safer way to call pcre_fullinfo - bug 60986 2012-02-06 18:18:53 +00:00
Rasmus Lerdorf
090bb97555 Safer way to call pcre_fullinfo - bug 60986 2012-02-06 18:18:53 +00:00
Rasmus Lerdorf
0f6e3408db Fix for bug 60986 2012-02-06 18:11:56 +00:00
Rasmus Lerdorf
704c45ec3e Fix for bug 60986 2012-02-06 18:11:56 +00:00
Rasmus Lerdorf
0f0261e0b7 Fix for bug 60986 2012-02-06 18:11:56 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Pierre Joye
43d20bca91 - revert incorrect fix introduced in r316528 2011-09-12 12:59:52 +00:00
Pierre Joye
4ce7228b00 - revert incorrect fix introduced in r316528 2011-09-12 12:59:52 +00:00
Pierre Joye
4891b29d6b - revert incorrect fix introduced in r316528 2011-09-12 12:59:52 +00:00
Hannes Magnusson
5e661cf904 Ensure we are working with strings here 2011-09-12 11:44:55 +00:00
Hannes Magnusson
ee27f57095 Ensure we are working with strings here 2011-09-12 11:44:55 +00:00
Hannes Magnusson
7bb31903c8 Ensure we are working with strings here 2011-09-12 11:44:55 +00:00
Rasmus Lerdorf
741f41ff18 efree match_sets on an error here - found by Coverity 2011-08-05 22:39:40 +00:00
Rasmus Lerdorf
f7e07ae69b efree match_sets on an error here - found by Coverity 2011-08-05 22:39:40 +00:00
Rasmus Lerdorf
c9342c81d6 efree match_sets on an error here - found by Coverity 2011-08-05 22:39:40 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Rasmus Lerdorf
ba8ce4a6d4 Increase the overly conservative pcre backtrack limit from 100000 to 1000000 2011-05-21 19:48:37 +00:00
Rasmus Lerdorf
f5a9e17f9c Increase the overly conservative pcre backtrack limit from 100000 to 1000000 2011-05-21 19:48:37 +00:00
Rasmus Lerdorf
cebe2a2139 Increase the overly conservative pcre backtrack limit from 100000 to 1000000 2011-05-21 19:48:37 +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
Felipe Pena
1db7472a73 - Coding standards 2010-11-06 18:35:38 +00:00
Felipe Pena
1c556f2030 - Coding standards 2010-11-06 18:35:38 +00:00
Felipe Pena
f4927c28bc - Fixed bug #52732 (Docs say preg_match() returns FALSE on error, but it returns int(0))
patch by: slugonamission at gmail dot com
2010-11-06 18:32:10 +00:00
Felipe Pena
03cbbf4348 - Fixed bug #52732 (Docs say preg_match() returns FALSE on error, but it returns int(0))
patch by: slugonamission at gmail dot com
2010-11-06 18:32:10 +00:00
Adam Harvey
6bc20667c7 Fix bracket in prototype comment. 2010-11-05 18:12:30 +00:00
Adam Harvey
8365739663 Implemented FR #53238 (Make third parameter of preg_match_all optional). 2010-11-05 04:37:27 +00:00
Felipe Pena
090a9b3331 - Fixed bug #52971 (PCRE-Meta-Characters not working with utf-8)
#   In  PCRE,  by  default, \d, \D, \s, \S, \w, and \W recognize only ASCII
#       characters, even in UTF-8 mode. However, this can be changed by setting
#       the PCRE_UCP option.
2010-10-03 16:01:38 +00:00
Felipe Pena
87a2373422 - Fixed bug #52971 (PCRE-Meta-Characters not working with utf-8)
#   In  PCRE,  by  default, \d, \D, \s, \S, \w, and \W recognize only ASCII
#       characters, even in UTF-8 mode. However, this can be changed by setting
#       the PCRE_UCP option.
2010-10-03 16:01:38 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Felipe Pena
a94558c855 - Added MAKE_COPY_ZVAL(ppzv, pzv) macro 2009-12-08 01:57:37 +00:00