Commit Graph

265 Commits

Author SHA1 Message Date
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Adam Harvey
0b96b4c4e9 Merge branch 'PHP-5.4'
* PHP-5.4:
  Update arginfo for preg_match_all() to reflect reality.
  fix invalid read when trimming empty string
2012-11-12 20:09:18 +08:00
Adam Harvey
bca8ff723d Update arginfo for preg_match_all() to reflect reality.
Back when I implemented FR #53238 during the 5.4 development phase to make the
$matches parameter optional in preg_match_all(), it turns out I forgot to
update the arginfo to note that only 2 parameters are now required by
preg_match_all(). The function itself works fine, but reflection was reporting
the wrong number of required parameters.
2012-11-12 20:04:26 +08:00
Dmitry Stogov
0716ddcdb2 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #63180 (Corruption of hash tables)
  fix bug #63369

Conflicts:
	NEWS
2012-10-26 09:49:21 -07:00
Dmitry Stogov
68b229ea73 Fixed bug #63180 (Corruption of hash tables) 2012-10-26 09:47:30 -07: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
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
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
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +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
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
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
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
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
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Felipe Pena
1c556f2030 - Coding standards 2010-11-06 18:35:38 +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
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
Felipe Pena
b4ee727353 - Fixed bug #49483 (preg_replace 'subject' parameter listed as optional) 2009-09-06 17:41:34 +00:00
Matt Wilmas
d55300298e MFH: Added zend_eval_stringl and made create_function(), etc. binary-safe 2009-06-05 18:50:32 +00:00
Nuno Lopes
ae57857eba fix bug #47662: support more than 127 named subpatterns 2009-04-10 15:47:15 +00:00
Nuno Lopes
4ff9ad5bf1 fix bug #47229: preg_quote should escape '-' 2009-01-28 22:39:33 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Arnaud Le Blanc
261f0c32a5 initialize optional vars 2008-10-21 22:08:20 +00:00
Nuno Lopes
8a77e55566 clean some dead code (with static analysis help) 2008-09-23 15:18:26 +00:00
Nuno Lopes
1e3ebc2373 kill dead variables. found by LLVM's clang static analyzer 2008-09-02 19:10:38 +00:00
Marcus Boerger
42eb47d500 - MFH preg_filter()
# As discussed with Lukas
# [DOC] check out the test
2008-08-29 12:13:54 +00:00
Nuno Lopes
f797495527 after rereading the documentation about preg_grep(), lets match the behavior in HEAD (return the original array elements instead of the new string).
tune the test accordingly
2008-08-14 14:37:39 +00:00
Nuno Lopes
31c657b3bb Fixed bug #44925 (preg_grep() modifies input array) 2008-08-14 13:12:42 +00:00
Felipe Pena
e304515ddb - MFH: Added parameter TSRMLS_DC in zend_is_callable() 2008-08-02 04:46:07 +00:00
Dmitry Stogov
d5ef2f466c Added support for lambda functions and closures 2008-07-14 09:49:03 +00:00