clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,999 Commits 494 Branches 1,367 Tags 809 MiB
802a25e0c9
Commit Graph

285 Commits

Author SHA1 Message Date
Anatol Belski
96388c78c9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix zts check
 2013-03-14 14:39:47 +01:00
Anatol Belski
5df8cf1975 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix zts check
 2013-03-14 14:39:09 +01:00
Anatol Belski
e43c5a8395 fix zts check 2013-03-14 14:38:20 +01:00
Anatol Belski
2635408a0d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed PCRE locale crash in Windows/TS
 2013-03-04 09:15:17 +01:00
Anatol Belski
4e46a87392 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed PCRE locale crash in Windows/TS
 2013-03-04 09:14:14 +01:00
Stephen A. Zarkos
b6fdb60ecf Fixed PCRE locale crash in Windows/TS 2013-03-04 09:09:45 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +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
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