Anatol Belski
3485925a3a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
remove BOM from NEWS
2014-12-30 16:51:06 +01:00
Anatol Belski
d5123415f6
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
2014-12-30 16:50:22 +01:00
Veres Lajos
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
Stanislav Malyshev
90ba99a2c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-11-03 11:38:29 -08:00
Stanislav Malyshev
279550ee85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
Conflicts:
configure.in
ext/curl/interface.c
main/php_version.h
2014-11-03 11:37:43 -08:00
Stanislav Malyshev
c351b47ce8
Initialize the offset table - PCRE may sometimes miss offsets
2014-11-03 11:31:02 -08:00
Lior Kaplan
56d02d564e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
typofixes
2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typofixes
2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1
typofixes
2014-08-17 15:44:02 +03:00
Anatol Belski
c925c7a5b6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
2014-05-09 22:16:42 +02:00
Anatol Belski
c62f32c3cc
Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
...
upstream patch applied
2014-05-09 22:15:54 +02:00
Nikita Popov
42562ee913
Add support for PCRE marks
...
If a MARK is set then it will be returned in the $matches array
unter key "MARK". If no MARK is used or passed, the key will not
be set.
2014-03-17 22:32:40 +01:00
Anatol Belski
f2d42e1624
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
pcre tests go with 8.34 upgrade
2014-02-04 10:34:51 +01:00
Anatol Belski
ab32d36ec6
pcre tests go with 8.34 upgrade
2014-02-04 10:34:11 +01:00
Anatol Belski
353e2643ab
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
pcre upgraded to 8.34
2014-02-04 10:31:52 +01:00
Anatol Belski
23cb7bd506
pcre upgraded to 8.34
2014-02-04 10:31:07 +01:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Dmitry Stogov
6c2a806820
Avoid interned hash key duplication and hash key length recaclulation
2013-11-29 00:57:49 +04:00
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