Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
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
Anatol Belski
1cda84a986
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
merged PCRE 8.32
2013-03-03 19:10:12 +01:00
Anatol Belski
ca4a3e6138
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
merged PCRE 8.32
2013-03-03 19:07:49 +01:00
Anatol Belski
357ab3cbad
merged PCRE 8.32
...
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
2013-03-03 19:06:22 +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
Anatoliy Belsky
8b0704618f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:52:43 +02:00
Anatoliy Belsky
d2fa182f25
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:51:58 +02:00
Anatoliy Belsky
276c5de0d8
Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:49:28 +02:00
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
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +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
Ferenc Kovacs
1313220640
These regexes don't fail under the new backtrack limit, so lower it just for the test to check the failure.
2011-09-04 13:27:19 +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
Pierrick Charron
824726073b
Delete empty test files (old MQ tests)
2011-07-22 12:12:05 +00:00
Pierrick Charron
fb5da94c1b
Delete empty test files (old MQ tests)
2011-07-22 12:12:05 +00:00
Pierre Joye
45420bb669
- 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, missing tests changes in 5.4
2011-07-22 11:56:20 +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
c9e41e8901
These regexes don't fail under the new backtrack limit, so lower it
...
just for the test to check the failure.
2011-06-12 18:38:26 +00:00
Rasmus Lerdorf
c30bde0ef5
These regexes don't fail under the new backtrack limit, so lower it
...
just for the test to check the failure.
2011-06-12 18:38:26 +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
Scott MacVicar
74b8f72017
Fix Windows build, this really should be in a patch file / README.
...
I'll fix this up later.
2011-05-13 13:51:07 +00:00
Scott MacVicar
db0c957f02
Fix Windows build, this really should be in a patch file / README.
...
I'll fix this up later.
2011-05-13 13:51:07 +00:00
Scott MacVicar
27fc1b889a
Update bundled PCRE to 8.12
2011-05-13 07:00:45 +00:00
Scott MacVicar
6ec23faa99
Update bundled PCRE to 8.12
2011-05-13 07:00:45 +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
Gustavo André dos Santos Lopes
ff32c32fba
- Fix PCRE build on Windows; closes bug #53606 .
2010-12-24 19:01:25 +00:00
Gustavo André dos Santos Lopes
3143828eb3
- Fix PCRE build on Windows; closes bug #53606 .
2010-12-24 19:01:25 +00:00
Ilia Alshanetsky
34c6447e9e
Upgraded\ bundled\ PCRE\ to\ version\ 8.11.
2010-12-24 15:03:29 +00:00
Ilia Alshanetsky
15b7a4476a
Upgraded\ bundled\ PCRE\ to\ version\ 8.11.
2010-12-24 15:03:29 +00:00
Pierre Joye
aea6771d19
- add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :)
2010-12-13 18:43:10 +00:00
Pierre Joye
a7ffa09e18
- add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd
2010-12-11 22:18:10 +00:00
Felipe Pena
43206c8c68
- Added missing test
2010-11-15 18:46:59 +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
Ilia Alshanetsky
bbeafa1dcf
Win32 build fixes
2010-08-14 14:47:49 +00:00
Ilia Alshanetsky
c5602787fc
MFH: Upgraded bundled PCRE to version 8.10.
2010-08-14 14:37:13 +00:00
Kalle Sommer Nielsen
a448b6a72b
MFB53: Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED ( Fixes #52570 )
...
# Some of the updated tests were to make them sync with 5.3 although they don't run on trunk anymore
2010-08-11 21:41:30 +00:00
Kalle Sommer Nielsen
8deefa8780
Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED ( Fixes #52570 )
...
# Trunk patch will follow shortly
2010-08-11 21:12:18 +00:00
Pierre Joye
8d0fb1c964
- fix build
2010-07-29 12:06:15 +00:00
Pierre Joye
110fab9803
- fix build
2010-07-29 11:58:41 +00:00