Anatol Belski
734a5fca2c
update NEWS
2016-04-28 19:31:12 +02:00
Dmitry Stogov
9e4de0cbdc
Added test
2016-04-28 19:24:32 +02:00
Bob Weinand
ee2c9065d8
Fixed bug #72116 (7.0.6 array_fill optimization breaks implementation)
2016-04-28 19:24:13 +02:00
Dmitry Stogov
75fa8842f4
Fixed BC break described by bug #72119 .
...
It was introduced after 7.0.5 release by attempt to fix bug #71428 .
2016-04-28 19:21:14 +02:00
Stanislav Malyshev
3b8d4de300
Fix bug #71923 - integer overflow in ZipArchive::getFrom*
2016-04-27 17:51:54 +02:00
Anatol Belski
7133f28df5
set versions
2016-04-27 14:47:57 +02:00
Anatol Belski
11bcba38cc
update NEWS
2016-04-27 14:45:58 +02:00
Anatol Belski
f16bc42465
fix/improve tests
2016-04-27 14:35:23 +02:00
Anatol Belski
66f92ec63b
fix merge
2016-04-27 13:37:48 +02:00
Anatol Belski
4c0d91caef
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix memory leak
Fix bug #72099 : xml_parse_into_struct segmentation fault
5.5.36 now
Fix bug #72094 - Out of bounds heap read access in exif header processing
Fix bug #72093 : bcpowmod accepts negative scale and corrupts _one_ definition
Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
Fix for bug #71912 (libgd: signedness vulnerability)
Typo in NEWS
2016-04-27 13:21:30 +02:00
Anatol Belski
eaaa1affbc
sync with NEWS improvements
2016-04-25 10:04:28 +02:00
Remi Collet
8090c73262
fix skipif
2016-04-12 13:50:01 +02:00
Xinchen Hui
de3cc93543
This only make sense on *nix
2016-04-12 10:44:31 +02:00
Anatol Belski
83b22e0f56
set RC1 versions
2016-04-12 07:04:44 +02:00
Anatol Belski
a1e9de227d
update NEWS
2016-04-11 15:37:45 +02:00
Anatol Belski
28b6f66a77
Fixed bug #70484 selectordinal doesn't work with named parameters
2016-04-11 15:01:22 +02:00
Anatol Belski
f62943edc8
fix version macro to check
2016-04-11 15:01:22 +02:00
Joe Watkins
c0b821d2e9
handle dummy frame
2016-04-11 13:24:37 +01:00
Joe Watkins
707941413d
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-04-11 08:04:14 +01:00
Joe Watkins
028485ae69
fix calendar segfault
2016-04-11 08:03:15 +01:00
Anatol Belski
190db69109
update NEWS
2016-04-10 19:10:45 +02:00
Anatol Belski
b4ab0effc7
Fixed bug #71998 Function pg_insert does not insert when column type = inet
2016-04-10 18:48:35 +02:00
Anatol Belski
58ea2ad489
Fixed bug #65480 No declaration for msgformat_fix_quotes() in msgformat.c or msgformat_attr.c
2016-04-09 19:11:28 +02:00
Xinchen Hui
fcbd95930c
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2016-04-09 10:02:20 -07:00
Xinchen Hui
5db4d9a71c
Fixed bug #71995 (Returning the same var twice from __sleep() produces broken serialized data)
2016-04-09 10:01:04 -07:00
Anatol Belski
e33c26659e
update NEWS
2016-04-09 18:52:59 +02:00
Anatol Belski
ef17343b3c
Fixed bug #66289 Locale::lookup incorrectly returns en or en_US if locale is empty
2016-04-09 18:24:42 +02:00
Lior Kaplan
c6c44c3629
Enable configure without opcache-file and huge-code-pages
...
This doesn't chagne the default (yes for both features), but respects
--disable-opcache-file and --disable-huge-code-pages configure flags if given.
2016-04-09 15:57:57 +03:00
Lior Kaplan
403c3f95fe
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
opcache config.m4: Use = for comparison
2016-04-09 01:35:30 +03:00
Lior Kaplan
c1f597d9a1
opcache config.m4: Use = for comparison
2016-04-08 22:38:07 +03:00
Anatol Belski
73815573e0
fix indent
2016-04-08 14:17:57 +02:00
Anatol Belski
f691fe343c
update NEWS
2016-04-08 13:51:29 +02:00
Anatol Belski
45d9efaac3
fix compat for ICU < 50
2016-04-08 12:48:26 +02:00
Anatol Belski
1541a55a4f
Fixed bug #68893 Stackoverflow in datefmt_create
2016-04-08 12:31:19 +02:00
Daniel Persson
f7600e17cb
Added missing newline.
2016-04-08 12:31:19 +02:00
Daniel Persson
0030fa322f
Changed to check for error with the new function that returns null if error is set
2016-04-08 12:31:19 +02:00
Daniel Persson
e3b160bf86
Added function to check error and return null if error is set.
2016-04-08 12:31:19 +02:00
Daniel Persson
ff2af89519
Added tests for bug 70451 and 70452
2016-04-08 12:31:19 +02:00
Xinchen Hui
c45f7b97a3
Fixed bug #71986 (Nested foreach assign-by-reference creates broken variables)
2016-04-08 17:57:51 +08:00
Anatol Belski
94e889299b
update NEWS
2016-04-08 11:01:42 +02:00
Anatol Belski
93f8eaf3b8
Fixed bug #70455 Missing constant: IntlChar::NO_NUMERIC_VALUE
2016-04-08 09:55:57 +02:00
Anatol Belski
f042c5f726
update NEWS
2016-04-08 09:28:41 +02:00
Anatol Belski
49d31fa01d
Fixed bug #71516 IntlDateFormatter losts locale if pattern is set via constructor
2016-04-08 08:59:43 +02:00
Xinchen Hui
d242a8fb68
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Fixed bug #71980
2016-04-07 19:29:49 +08:00
Xinchen Hui
c85907682a
Improved fix for #71940
2016-04-07 19:28:54 +08:00
Nikita Popov
aad4ecebf8
Fixed bug #71980
2016-04-07 12:29:59 +02:00
Xinchen Hui
079239a7ce
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Remove __halt_compiler from semi-reserved tokens
Fixed Bug #71974 Trans sid will always be send, even if cookies are available
Optimized array_fill(). This is a perfect function for fast creation of packed arrays.
Fixed build
fix merge mistake
fix tests
PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
fix indent
Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
fix test
fix bug #71667 (emulate how mssql extension names "computed" columns)
update NEWS
add 32-bit specific variont for #62498
skip test on 32-bit
make opcache lockfile path configurable
return zvals instead of strings, cast or not based on stringify attribute
fix test
add skip slow test
2016-04-07 13:58:00 +08:00
Xinchen Hui
7e042224a2
Fixed bug #71940 (Unserialize crushes on restore object reference)
2016-04-07 13:56:55 +08:00
Nikita Popov
5ab950cb2c
Remove __halt_compiler from semi-reserved tokens
...
token_get_all() is not capable of dealing with this one correctly.
2016-04-07 05:52:32 +02:00
Yasuo Ohgaki
6467a4eb36
Fixed Bug #71974 Trans sid will always be send, even if cookies are available
2016-04-07 10:26:05 +09:00
Dmitry Stogov
b31240f995
Optimized array_fill(). This is a perfect function for fast creation of packed arrays.
2016-04-07 01:01:11 +03:00
Dmitry Stogov
088f55ae74
Fixed build
2016-04-07 00:59:21 +03:00
Anatol Belski
6489edb958
fix merge mistake
2016-04-06 18:05:39 +02:00
Anatol Belski
26f9aa7211
fix tests
2016-04-06 17:43:49 +02:00
Petr Sýkora
aeb9c81c09
PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
2016-04-06 17:43:49 +02:00
Anatol Belski
052c1d337c
fix indent
2016-04-06 17:43:49 +02:00
Dmitry Stogov
e9d65160e8
Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
2016-04-06 17:17:10 +03:00
Anatol Belski
ea64d290fe
fix test
2016-04-06 14:44:23 +02:00
Adam Baratz
ed3edc2f05
fix bug #71667 (emulate how mssql extension names "computed" columns)
2016-04-06 14:41:55 +02:00
Anatol Belski
c256a8c25e
update NEWS
2016-04-06 14:13:43 +02:00
Anatol Belski
4f7d89a335
add 32-bit specific variont for #62498
2016-04-06 14:05:25 +02:00
Anatol Belski
02fc9cb31f
skip test on 32-bit
...
The Postgres INT8 datatype is handled as string on 32-bit
2016-04-06 13:55:32 +02:00
Fatih ACAR
d54eafb349
make opcache lockfile path configurable
...
Signed-off-by: William Dauchy <william@gandi.net >
Signed-off-by: Baptiste Daroussin <baptiste.daroussin@gandi.net >
Signed-off-by: Fatih Acar <fatih.acar@gandi.net >
2016-04-06 13:29:52 +02:00
Adam Baratz
1e1500a2bc
return zvals instead of strings, cast or not based on stringify attribute
2016-04-06 12:18:53 +02:00
Anatol Belski
354a682c38
fix test
2016-04-06 08:21:10 +02:00
Anatol Belski
fd9137c00c
add skip slow test
2016-04-06 08:18:32 +02:00
Xinchen Hui
4e1d435bd1
Fixed order
2016-04-06 10:21:05 +08:00
Xinchen Hui
e95782ed5e
Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference)
2016-04-06 10:19:24 +08:00
Anatol Belski
6ae3915eee
update NEWS
2016-04-05 18:21:25 +02:00
Adam Baratz
8a92fed532
Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime()
2016-04-05 18:18:37 +02:00
Anatol Belski
df8f927446
update NEWS
2016-04-05 15:12:12 +02:00
Anatol Belski
c2cb4664bc
fix and extend test
2016-04-05 15:06:17 +02:00
Joe Bylund
e10257ba80
Don't roundtrip to the database to get the column type if you already know it
...
add_assoc_string now takes just three args
nikic's fix to move pqclear outside the if, would be a possible memory leak inside the if
(joe) check behavior of getColumnMeta
2016-04-05 15:03:04 +02:00
DQNEO
ea0598962f
remove description for apache 1.3
2016-04-05 12:13:38 +02:00
Anatol Belski
dedc9a4200
update NEWS
2016-04-05 11:55:36 +02:00
Anatol Belski
bbaa868c29
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-04-05 11:55:03 +02:00
Anatol Belski
5ed05bc686
update NEWS
2016-04-05 11:52:53 +02:00
Anatol Belski
d10a8e4804
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Use STR_EMPTY_ALLOC macro instead
Fix DateInterval::format segfault
2016-04-05 11:24:23 +02:00
Thomas Punt
1aea777349
Use STR_EMPTY_ALLOC macro instead
2016-04-05 11:18:14 +02:00
Thomas Punt
40f14bad33
Fix DateInterval::format segfault
2016-04-05 11:18:14 +02:00
Matteo Beccati
4090e709aa
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71447 (Quotes inside comments not properly handled)
Fixed a few PDO tests to conform to PDO Common standards
news entry #69537
Fix #69537 : __debugInfo with empty string for key gives error
Conflicts:
Zend/zend_compile.c
2016-04-05 00:07:02 +02:00
Matteo Beccati
30925cd498
Fixed bug #71447 (Quotes inside comments not properly handled)
2016-04-04 23:50:28 +02:00
Matteo Beccati
9a87108eca
Fixed a few PDO tests to conform to PDO Common standards
2016-04-04 23:43:17 +02:00
Anatol Belski
d2948d4b71
update NEWS
2016-04-04 17:42:06 +02:00
Adam Baratz
9fcfc18ca9
Fix #71943 : dblib_handle_quoter needs to allocate an extra byte
2016-04-04 17:33:49 +02:00
Joe Watkins
9a65c69c62
news entry #71428
2016-04-04 10:30:23 +01:00
Joe Watkins
0797cfdda9
news entry #69537
2016-04-04 10:23:19 +01:00
Joe Watkins
cd038cc5eb
news entry #69537
2016-04-04 10:22:13 +01:00
Joe Watkins
922a4048e4
news entry 71609
2016-04-04 10:20:26 +01:00
Joe Watkins
4d5bb45b3b
magical notation is magical
2016-04-04 09:33:20 +01:00
Joe Watkins
860c55466e
move this to standard [ci skip]
2016-04-04 09:26:17 +01:00
Joe Watkins
c1dec143d6
news updates
2016-04-04 09:21:06 +01:00
Joe Watkins
9a38b2dbce
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-04-03 12:41:23 +01:00
Joe Watkins
14e4c610e9
Fix #69537 : __debugInfo with empty string for key gives error
2016-04-03 12:40:29 +01:00
Joe Watkins
91c10662c8
fix #69537 : __debugInfo with empty string for key gives error
2016-04-03 12:38:25 +01:00
Elizabeth Marie Smith
4df5f79ab5
Fix ODBC bug for varchars returning with length zero
2016-04-01 17:11:58 +02:00
Xinchen Hui
5b1bb41c0b
Fixed bug #71930 (_zval_dtor_func: Assertion `(arr)->gc.refcount <= 1' failed)
2016-04-01 22:27:29 +08:00
Joe Watkins
034e8ec02e
fix #71287 (substr_replace bug when length type is string)
2016-03-31 17:10:12 +01:00
Joe Watkins
d9e4510224
remove unused params || woops
2016-03-31 12:51:00 +01:00
Joe Watkins
3b13206aa9
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-03-31 12:40:15 +01:00
Joe Watkins
233115ea23
fix #71609 : Segmentation fault on ZTS with gethostbyname
2016-03-31 12:39:01 +01:00
Anatol Belski
e6bb7eb3aa
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix borked mainstream patch
5.5.35 now
2016-03-31 01:38:22 +02:00
Anatol Belski
a00c2b1bf5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix borked mainstream patch
5.5.35 now
2016-03-31 01:36:47 +02:00
Anatol Belski
4b0b1cec00
fix borked mainstream patch
2016-03-31 01:33:38 +02:00
Anatol Belski
9dc6c33740
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix test to not to cause false positives
2016-03-31 01:30:23 +02:00
Anatol Belski
ed707a5217
fix test to not to cause false positives
2016-03-31 01:29:05 +02:00
Lior Kaplan
3b26af59d4
Align NEWS entry format
2016-03-31 01:01:11 +03:00
Lior Kaplan
53ce826cdd
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-31 00:54:43 +03:00
Lior Kaplan
cef40c0c3f
Align NEWS entry format
2016-03-31 00:52:53 +03:00
Nikita Popov
b1e854f776
Fix bug #71334
...
Always duplicate the array before doing a sort with user-defined
comparison function, to avoid access to the intermediate
inconsistent state.
I've also dropped the "array modification" warning, as protection
against modifications is no longer relevant if we're always working
on a copy anyway.
This also required some changes to how SplArray forwards calls to
sorting functions.
2016-03-30 22:49:27 +02:00
Ferenc Kovacs
1866ab2d1e
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-03-30 22:29:00 +02:00
Ferenc Kovacs
abd59c0e40
update NEWS
2016-03-30 22:28:28 +02:00
Nikita Popov
f95679885f
Fix __invoke comparison in closure_get_method
...
It compared against the wrong variable. Fixed this by getting rid
of lc_name entirely and use equals_literal_ci instead.
2016-03-30 18:32:00 +02:00
Matteo Beccati
3bfe1c55ae
Removed shmop test leaking an shm segment
2016-03-30 10:00:28 +02:00
Nikita Popov
ed06d130f7
Fixed bug #71922
2016-03-29 19:29:19 +02:00
Julien Pauli
f0120ff878
5.5.35 now
2016-03-29 18:11:03 +02:00
Anatol Belski
c7f7139985
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix dir separator in test
2016-03-29 14:20:30 +02:00
Anatol Belski
23d0065744
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2016-03-29 14:19:35 +02:00
Anatol Belski
551423c642
fix dir separator in test
2016-03-29 14:18:25 +02:00
Anatol Belski
dd0a96ae70
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
2016-03-29 13:12:47 +02:00
Anatol Belski
5272184a1e
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
...
The actual fix is applying the upstream patch from
https://github.com/file/file/commit/6713ca45e7757297381f4b4cdb9cf5e624a9ad36
2016-03-29 13:11:25 +02:00
Anatol Belski
84990ab346
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
2016-03-29 13:11:17 +02:00
Anatol Belski
fe13566c93
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
...
The actual fix is applying the upstream patch from
https://github.com/file/file/commit/6713ca45e7757297381f4b4cdb9cf5e624a9ad36
2016-03-29 13:10:39 +02:00
Joe Watkins
5074fd9c7c
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-03-29 11:34:58 +01:00
Joe Watkins
d12ed0c7fa
remove unused param
2016-03-29 11:34:18 +01:00
Anatol Belski
3b08638340
update NEWS
2016-03-29 12:05:36 +02:00
Xinchen Hui
f5bdc137fb
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Updated to version 2016.3 (2016c)
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
Fix bug #71798 - Integer Overflow in php_raw_url_encode
update NEWS
Disable huge pages in the Zend allocator by default As per the discussion on internals, this is an expert feature that needs special system-level configuration and care.
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
Fix bug #71860 : Require valid paths for phar filenames
Fix bug #71860 : Require valid paths for phar filenames
update NEWS
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Merge branch 'PHP-5.6' into PHP-7.0
Updated to version 2016.2 (2016b)
update libs versions
set RC1 versions
Going for 5.5.34
2016-03-29 18:02:00 +08:00
Xinchen Hui
256593abcf
Update tests
2016-03-29 17:52:58 +08:00
Anatol Belski
f2ca3c6036
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
2016-03-29 11:26:09 +02:00
Anatol Belski
6afa41cf80
Merge remote-tracking branch 'origin/PHP-7.0.5' into PHP-7.0
...
* origin/PHP-7.0.5:
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Updated to version 2016.3 (2016c)
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
Fix bug #71798 - Integer Overflow in php_raw_url_encode
update NEWS
Disable huge pages in the Zend allocator by default As per the discussion on internals, this is an expert feature that needs special system-level configuration and care.
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
Fix bug #71860 : Require valid paths for phar filenames
Fix bug #71860 : Require valid paths for phar filenames
update NEWS
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Merge branch 'PHP-5.6' into PHP-7.0
Updated to version 2016.2 (2016b)
update libs versions
set RC1 versions
Going for 5.5.34
2016-03-29 11:24:33 +02:00
Xinchen Hui
2e6d70787c
Fixed bug #71914 (Reference is lost in "switch")
2016-03-29 17:14:36 +08:00
Joe Watkins
dd70c39556
fix bug #71428 : Validation type inheritance with = NULL
2016-03-29 09:57:51 +01:00
Joe Watkins
3f56dfe866
Bug #71428 work ... hopefully, fix drupal 8
2016-03-29 09:36:08 +01:00
Stanislav Malyshev
67fbb06311
Merge branch 'PHP-5.5' into PHP-7.0.5
...
* PHP-5.5:
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fix bug #71798 - Integer Overflow in php_raw_url_encode
Fix bug #71860 : Require valid paths for phar filenames
Going for 5.5.34
Conflicts:
configure.in
ext/phar/phar_object.c
ext/phar/tests/badparameters.phpt
ext/phar/tests/create_path_error.phpt
ext/phar/tests/pharfileinfo_construct.phpt
ext/snmp/snmp.c
ext/standard/url.c
main/php_version.h
2016-03-28 23:55:05 -07:00
Stanislav Malyshev
57d170aae0
Merge remote-tracking branch 'security/PHP-7.0.5' into PHP-7.0.5
...
* security/PHP-7.0.5:
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
Fix bug #71860 : Require valid paths for phar filenames
update NEWS
Fixed bug #71704 php_snmp_error() Format String Vulnerability
2016-03-28 23:49:03 -07:00
Stanislav Malyshev
cc7631dd08
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #71704 php_snmp_error() Format String Vulnerability
2016-03-28 23:45:15 -07:00
Anatol Belski
9c19a08b9d
Fixed bug #71704 php_snmp_error() Format String Vulnerability
...
Conflicts:
ext/snmp/snmp.c
2016-03-28 23:42:19 -07:00
Stanislav Malyshev
a18b1f74fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
2016-03-28 23:30:14 -07:00
Stanislav Malyshev
3dd82caf57
Merge branch 'PHP-5.5.34' into PHP-5.5
...
* PHP-5.5.34:
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
2016-03-28 23:29:45 -07:00
Stanislav Malyshev
62da5cdf3d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fix bug #71798 - Integer Overflow in php_raw_url_encode
Fix bug #71860 : Require valid paths for phar filenames
Going for 5.5.34
Conflicts:
configure.in
ext/phar/tests/create_path_error.phpt
main/php_version.h
2016-03-28 23:21:15 -07:00
Stanislav Malyshev
f8dd10508b
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
2016-03-28 23:15:16 -07:00
Derick Rethans
2d112e1378
Updated to version 2016.3 (2016c)
2016-03-28 15:31:51 +02:00
Joe Watkins
ee9a78a033
work on #71428
2016-03-28 11:54:25 +01:00
Stanislav Malyshev
64f42c73ef
Fixed bug #71906 : AddressSanitizer: negative-size-param (-1) in mbfl_strcut
2016-03-28 01:22:37 -07:00
Anatol Belski
e93c6910fc
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
...
The actual fix is applying the upstream patch from
https://github.com/file/file/commit/6713ca45e7757297381f4b4cdb9cf5e624a9ad36
2016-03-28 00:45:19 +02:00
Stanislav Malyshev
95433e8e33
Fix bug #71798 - Integer Overflow in php_raw_url_encode
2016-03-27 14:22:19 -07:00
Joe Watkins
28f66763a4
fix #70189 (SAPI sends empty Content-Type when default_mimetype is empty)
2016-03-27 06:50:11 +01:00
Joe Watkins
32df2210d7
my commits are bad, and I feel bad (test for bug #71414 )
2016-03-26 23:59:46 +00:00
Joe Watkins
4327370d13
fix #71414 (Interface method override inherited method and implemented in a trait causes fatal error)
2016-03-26 23:47:31 +00:00
Joe Watkins
1a75cd29a2
add test for bug
2016-03-26 11:15:08 +00:00
Joe Watkins
373da7aa6f
fix standard object handler for properties when type == BP_VAR_IS
2016-03-26 11:15:08 +00:00
Nikita Popov
bd90f5507f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/standard/crypt.c
2016-03-25 20:23:04 +01:00
Nikita Popov
54da966883
Fixed bug #67512
2016-03-25 20:18:46 +01:00
Xinchen Hui
1929fc9b16
Fixed bug #71891 (header_register_callback() and register_shutdown_function())
...
Actually, this fixed the memleak not the behavior(it is expected
behavior that "shutdown" is not outputed)
2016-03-25 12:34:22 +08:00
Derick Rethans
70878a92b1
Updated to version 2016.3 (2016c)
2016-03-24 11:09:07 +00:00
Derick Rethans
35b19d8dcc
Empty merge
2016-03-24 11:09:06 +00:00
Derick Rethans
c4681ec8e1
Updated to version 2016.3 (2016c)
2016-03-24 11:09:05 +00:00
Anatol Belski
d6eff6655c
update NEWS
2016-03-23 12:32:16 +01:00
Anatol Belski
4bbc811ff4
update NEWS
2016-03-23 12:28:48 +01:00
Rasmus Lerdorf
06c2b31866
Disable huge pages in the Zend allocator by default
...
As per the discussion on internals, this is an expert feature
that needs special system-level configuration and care.
2016-03-23 12:23:35 +01:00
Dmitry Stogov
75dd4a7a50
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
2016-03-23 12:23:03 +01:00
Xinchen Hui
a3946de339
Fixed Bug #71884 (Null pointer deref (segfault) in stream_context_get_default)
2016-03-23 16:16:26 +08:00
Anatol Belski
241ba9dcb1
if there's no JIT support, no RINIT is really needed
2016-03-22 21:42:21 +01:00
Rasmus Lerdorf
1efcdaf092
Disable huge pages in the Zend allocator by default
...
As per the discussion on internals, this is an expert feature
that needs special system-level configuration and care.
2016-03-22 08:04:53 -07:00
Xinchen Hui
b49ec68134
Update test script
2016-03-22 11:28:19 +08:00
Nikita Popov
dc842bbf8d
Fixed bug #71871
2016-03-21 22:49:18 +01:00
Anatol Belski
e988239634
decrease the default PCRE JIT stack to 64K
2016-03-21 18:59:39 +01:00
Anatol Belski
e23a41225f
Increase PCRE JIT stack size
...
It is done by implementing the custom stack usage. This makes the
JIT with mode on more compatible with the JIT mode off. Until now, the
default PCRE JIT stack was used which is 32kb big by default. There
are situations where some patterns would fail with JIT while working
correctly without JIT.
The starting size of the JIT stack is still set to 32kb, while the
max is set to the permissive 256kb (and can be increased up to 1mb).
As until now no suchlike bugs regarding JIT were reported, it is expected,
that the stack usage will stay by 32kb in most cases. Though providing
the custom stack, applications will have more room for some sporadic
stack increase, thus more compatibility.
2016-03-21 17:31:26 +01:00
Julien Pauli
cb240fe711
Updated NEWS
2016-03-21 15:40:01 +01:00
Julien Pauli
5ba7b9af1b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Updated NEWS
Reworked Fix bug #52098
Fix bug #52098
Conflicts:
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
2016-03-21 15:39:48 +01:00
Julien Pauli
abbe1551d6
Updated NEWS
2016-03-21 15:26:21 +01:00
Julien Pauli
d3d64b7c62
Reworked Fix bug #52098
2016-03-21 15:23:18 +01:00
Daniel Persson
e541cd8e6b
Fix bug #52098
2016-03-21 15:04:11 +01:00
Xinchen Hui
d26ca89402
array_dup should not copy the nApplyCount
2016-03-21 19:19:05 +08:00
Xinchen Hui
9712a974be
Also protects object to array cast
2016-03-21 19:12:50 +08:00
Xinchen Hui
a9a46f17be
Update NEWS
2016-03-21 16:44:30 +08:00
Xinchen Hui
ead0dfc3c9
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Update NEWS for efacdc3
FIX #71831 : CURLOPT_NOPROXY applied as long instead of string
2016-03-21 16:43:55 +08:00
Xinchen Hui
c9c8e70463
Update NEWS for efacdc3
2016-03-21 16:43:30 +08:00
Xinchen Hui
056459dc9d
Merge branch 'PHP-5.6' of https://github.com/msierks/php-src into PHP-5.6
...
* 'PHP-5.6' of https://github.com/msierks/php-src :
FIX #71831 : CURLOPT_NOPROXY applied as long instead of string
2016-03-21 16:39:22 +08:00
Xinchen Hui
65ae7440b0
Merge branch 'bug71835' of https://github.com/bukka/php-src into PHP-7.0
...
* 'bug71835' of https://github.com/bukka/php-src :
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
2016-03-21 16:03:16 +08:00
Stanislav Malyshev
c4517b2a5e
Fix bug #71750 : use zend_string_safe_alloc for calculated allocations
2016-03-20 22:39:17 -07:00
Stanislav Malyshev
28a6ed9f9a
Fix bug #71735 : Double-free in SplDoublyLinkedList::offsetSet
2016-03-20 22:29:08 -07:00
Stanislav Malyshev
72281f29dd
Fix bug #71860 : Require valid paths for phar filenames
2016-03-20 21:33:11 -07:00
Stanislav Malyshev
1e9b175204
Fix bug #71860 : Require valid paths for phar filenames
2016-03-20 21:24:12 -07:00
Nikita Popov
f3309173f9
Fixed bug #62059
2016-03-20 18:17:44 +01:00
Nikita Popov
12f2665df8
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/spl/spl_observer.c
2016-03-20 17:48:06 +01:00
Nikita Popov
cc3cdd0057
Fixed bug #67582
2016-03-20 17:46:12 +01:00
Jakub Zelenka
7e069daa89
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
2016-03-20 15:56:27 +00:00
Nikita Popov
a175aa9dca
Fixed bug #71731
...
The read_dimension() handler in BP_VAR_IS mode will now call
offsetExists() before caling offsetGet(). This has always been a
problem, however recently the issue has been exacerbated, because
the null-coalesce operator ?? makes it visible for non-nested
array accesses.
Also fixes #69659 .
2016-03-20 13:35:00 +01:00
Nikita Popov
1f6d27d3d2
Fix use of UNDEF instead of NULL in read_dimension
2016-03-20 13:33:17 +01:00
Xinchen Hui
9564998e49
Fixed Bug #71859 (zend_objects_store_call_destructors operates on realloced memory, crashing)
2016-03-20 04:52:57 -07:00
Nikita Popov
8023204d21
Fixed bug #52339
...
Autoloader 101: Don't throw if you fail. PHP will throw for you.
2016-03-18 20:28:58 +01:00
Nikita Popov
a2522efa9f
Add extra ArrayObject::sort() test
2016-03-18 19:59:08 +01:00
Nikita Popov
094c808374
Fix bug #71838
2016-03-18 19:58:52 +01:00
Nikita Popov
fd95555107
Fix ZEND_DEBUG condition
2016-03-18 19:31:34 +01:00
Michael Sierks
efacdc3511
FIX #71831 : CURLOPT_NOPROXY applied as long instead of string
...
The CURLOPT_NOPROXY option value is converted to a long before
being applied as a curl option. This causes the option to have
no effect. This patch changes this conversion to a string.
2016-03-18 07:29:01 -05:00
Dmitry Stogov
69c9be5c99
typo
2016-03-18 10:27:46 +03:00
Dmitry Stogov
11594e86b8
typo
2016-03-18 10:25:48 +03:00
Xinchen Hui
5b8d0dc6ae
Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex
2016-03-18 11:50:03 +08:00
Dmitry Stogov
945a661912
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
2016-03-17 22:43:42 +03:00
Anatol Belski
28b6f0232b
fix and update NEWS
2016-03-17 19:04:56 +01:00
Anatol Belski
d529c3358c
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix and update NEWS
2016-03-17 19:03:46 +01:00
Anatol Belski
b8c9c92d44
fix and update NEWS
2016-03-17 19:02:08 +01:00
Xinchen Hui
a2ca4558b5
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2016-03-17 07:57:22 -07:00
Anatol Belski
ef8d6435a2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Backport patch for bug #71820
2016-03-17 15:55:37 +01:00
Xinchen Hui
93499bfd8a
Fixed test & ZEND_BOOL should result TMP_VAR
2016-03-17 07:55:25 -07:00
Xinchen Hui
345ecd9822
Fixed #71837 (Wrong arrays behaviour)
2016-03-17 07:41:41 -07:00
Anatol Belski
1b632cfe83
Backport patch for bug #71820
...
Rev b4eedd128b
2016-03-17 14:28:58 +01:00
Xinchen Hui
eb405623ec
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:/php-src:
fix NEWS
NEWS
Fix Bug #63171 Script hangs after max_execution_time
2016-03-17 21:27:23 +08:00
Xinchen Hui
383dde5b15
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
fix NEWS
NEWS
NEWS
Fix Bug #63171 Script hangs after max_execution_time
Fixed bug #71820 pg_fetch_object bind parameters before call constructor
2016-03-17 21:26:14 +08:00
Xinchen Hui
910e6dc6b8
Fixed for master
2016-03-17 21:10:08 +08:00
Remi Collet
e7f74a3f9b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix NEWS
2016-03-17 13:53:52 +01:00
Remi Collet
b5b1ba850a
fix NEWS
2016-03-17 13:53:42 +01:00
Remi Collet
9073208f6c
NEWS
2016-03-17 13:44:28 +01:00
Remi Collet
2291ebc0ea
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
NEWS
Fix Bug #63171 Script hangs after max_execution_time
2016-03-17 13:42:34 +01:00
Remi Collet
d513b4cde5
NEWS
2016-03-17 13:40:42 +01:00
Remi Collet
407ad28ae5
Fix Bug #63171 Script hangs after max_execution_time
...
If aborted via timer expiration, don't try to call any unixODBC function
which may hangs because of internal locks
2016-03-17 13:38:45 +01:00
Xinchen Hui
aef22ac1c1
Remove unnecessary pattern
2016-03-17 20:21:36 +08:00
Xinchen Hui
041a01fd6c
Fixed for PHP7
2016-03-17 20:20:01 +08:00
Xinchen Hui
820b0aa2ab
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
2016-03-17 19:54:33 +08:00
Xinchen Hui
8e2f658f49
Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
2016-03-17 19:54:19 +08:00
Anatol Belski
b4eedd128b
Fixed bug #71820 pg_fetch_object bind parameters before call constructor
...
If we want to fetch into an object of a custom class that implemens
__set handler, the corstructor has to be called first. The data
passed to the constructor can be possibly required in __set handler.
2016-03-17 12:41:55 +01:00
Xinchen Hui
dae086040e
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test script
2016-03-17 17:07:07 +08:00
Xinchen Hui
6d4aec029a
Fixed test script
2016-03-17 17:06:56 +08:00
Xinchen Hui
e12456603a
Remove typo
2016-03-17 15:27:36 +08:00
Xinchen Hui
b8f0cb063f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test script
2016-03-17 15:23:53 +08:00
Xinchen Hui
ead7632cf9
Fixed test script
2016-03-17 15:23:44 +08:00
Xinchen Hui
47f3b3df45
Update NEWS
2016-03-17 15:23:21 +08:00
Xinchen Hui
fe1a3fc08b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71841 (EG(error_zval) is not handled well)
Fixed bug #71840 (Unserialize accepts wrongly data)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/standard/var_unserializer.c
2016-03-17 15:22:44 +08:00
Xinchen Hui
5546f8be56
Fixed bug #71841 (EG(error_zval) is not handled well)
2016-03-17 15:16:47 +08:00
Xinchen Hui
6f241f5fad
Fixed bug #71840 (Unserialize accepts wrongly data)
2016-03-17 15:15:28 +08:00
Ferenc Kovacs
fba1c7629c
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
prepare for 5.6.20RC1
2016-03-17 01:47:37 +01:00
Ferenc Kovacs
14f4848fb0
prepare for 5.6.20RC1
2016-03-17 01:46:00 +01:00
Andrey Hristov
fa4addd409
More email fixing
2016-03-16 10:54:56 +01:00
Andrey Hristov
f2ab731a8c
Fix emails in headers. @mysql.com addresses are no more since many years.
2016-03-16 10:24:52 +01:00
Anatol Belski
884c7d181f
update NEWS
2016-03-16 09:50:51 +01:00
Anatol Belski
6e25966544
Fixed bug #71704 php_snmp_error() Format String Vulnerability
2016-03-16 09:48:40 +01:00
Remi Collet
ffe82dd775
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix #ifdef usage
2016-03-16 08:11:50 +01:00
Remi Collet
46293ed6d4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix #ifdef usage
2016-03-16 07:18:09 +01:00
Remi Collet
478c807128
fix #ifdef usage
2016-03-16 07:17:49 +01:00
Derick Rethans
89919b5ec5
Updated to version 2016.2 (2016b)
2016-03-15 11:17:57 +01:00
Derick Rethans
ba71144b8c
Updated to version 2016.2 (2016b)
2016-03-15 09:14:11 +00:00
Derick Rethans
a1c6481c63
Empty merge
2016-03-15 09:14:10 +00:00
Derick Rethans
ddc62f2e8b
Updated to version 2016.2 (2016b)
2016-03-15 09:14:09 +00:00
Anatol Belski
68a29ccb84
update libs versions
2016-03-15 09:51:47 +01:00
Anatol Belski
ba5b98db8c
update libs versions
2016-03-15 09:44:05 +01:00
Anatol Belski
6ec7ef39f4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update libs versions
2016-03-15 09:43:08 +01:00
Anatol Belski
73b9941622
update libs versions
2016-03-15 09:41:34 +01:00
Anatol Belski
7fead8e8f5
set RC1 versions
2016-03-15 08:32:03 +01:00
Anatol Belski
2921c0e3f6
prepare next
2016-03-15 08:24:41 +01:00
Anatol Belski
0ce801a587
update NEWS
2016-03-15 07:11:21 +01:00
Sean DuBois
68ebfc87ad
Fix bug #71624 , PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn
2016-03-15 07:02:40 +01:00
Anatol Belski
84651b32eb
fix uninitialized value
2016-03-15 06:43:29 +01:00
Anatol Belski
704a9aeea7
fix pointer truncation on 64 bit
2016-03-14 16:44:27 +01:00
Anatol Belski
ab7764d99b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix test
2016-03-14 15:58:05 +01:00
Anatol Belski
beda05269c
fix test
...
Many warnings won't appear with libxml2 >= 2.9.3 because in many
cases libxml2 2.9.3 will just abort processing.
2016-03-14 15:53:02 +01:00
Yasuo Ohgaki
ec12385f04
Update NEWS
...
Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Fixed Bug #71599 trans sid handling rework broke interaction with cookies
All of these bugs are caused by git global change in PHP-7.0.
2016-03-12 08:52:16 +09:00
Yasuo Ohgaki
ca61f5954b
Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
...
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Fixed Bug #71599 trans sid handling rework broke interaction with cookies
All of these bug is caused by git global change in PHP-7.0.
2016-03-12 08:40:37 +09:00
Yasuo Ohgaki
50fca7a02a
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
2016-03-12 08:15:47 +09:00
Nikita Popov
02743f43c2
Fixed bug #71806
2016-03-11 22:45:38 +01:00
Grigorii Sokolik
ccc5150f15
Fix bug #71767
2016-03-11 22:27:48 +01:00
Anatol Belski
fca831e8ad
update NEWS
2016-03-11 14:23:34 +01:00
Anatol Belski
884f3f0afd
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-03-11 14:23:07 +01:00
Anatol Belski
9d02e3b97e
update NEWS
2016-03-11 14:22:11 +01:00
Anatol Belski
d26d80ab75
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix DatePeriod::getEndDate() segfault
2016-03-11 14:12:54 +01:00
Thomas Punt
f3f5a07aa5
Fix DatePeriod::getEndDate() segfault
2016-03-11 14:08:48 +01:00
Anatol Belski
741bfe3932
fix build with clang on Winodws
2016-03-10 15:30:20 +01:00
Anatol Belski
8b5d09a195
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix error condition, part of bug #71753
2016-03-10 11:39:16 +01:00
Anatol Belski
8cd903ea68
fix error condition, part of bug #71753
2016-03-10 11:35:50 +01:00
Dmitry Stogov
99c44458da
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:php-src:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752 )
2016-03-10 13:34:41 +03:00
Dmitry Stogov
f8506c062f
More effecient fix for bug #71756
2016-03-10 13:33:36 +03:00
Anatol Belski
4d4c6cf14e
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752 )
2016-03-10 09:35:55 +01:00
Xinchen Hui
67f0770036
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752 )
...
cherry-picked from 7d5f71b0b1
2016-03-10 09:33:39 +01:00
Anatol Belski
3edd33083c
fix invalid pointer on 64-bit
2016-03-10 08:45:29 +01:00
Xinchen Hui
753bbad535
Useless check (part of #71753 )
2016-03-10 15:43:22 +08:00
Xinchen Hui
a0fac47364
object->ce should not be NULL
2016-03-10 15:26:15 +08:00
Xinchen Hui
351201bc7b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed typo (partially fix for #71753 )
Conflicts:
ext/standard/uuencode.c
2016-03-10 15:23:40 +08:00
Xinchen Hui
915a3762ef
Fixed typo (partially fix for #71753 )
2016-03-10 15:22:34 +08:00
Xinchen Hui
c3cf6f2a68
emalloc never returns NULL (partially fix for #71753 )
2016-03-10 15:15:26 +08:00
Xinchen Hui
675c295722
Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)
2016-03-10 15:09:51 +08:00
Xinchen Hui
98c625a31c
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
2016-03-10 15:02:10 +08:00
Xinchen Hui
9833c76d3f
Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
2016-03-10 14:58:10 +08:00
Xinchen Hui
7d5f71b0b1
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752 )
2016-03-10 14:24:13 +08:00
Nikita Popov
5a6da79fd0
Fix bug #71659
2016-03-09 23:00:53 +01:00
Anatol Belski
86229f9943
fix SKIPIF sections
2016-03-09 14:28:38 +01:00
Anatol Belski
a2022fd82a
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix directory separator
2016-03-09 14:17:30 +01:00
Anatol Belski
a1d1f54b42
fix directory separator
2016-03-09 14:16:29 +01:00
Xinchen Hui
9aa73d3800
Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
2016-03-09 12:16:24 +08:00
Anatol Belski
7a4c2fa829
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix regression introduced in 5683b6fa39
2016-03-08 13:16:08 +01:00
Anatol Belski
8ca02bb233
fix regression introduced in 5683b6fa39
...
Test extended. Basically, both iterator type and next node have
to be checked.
2016-03-08 12:59:59 +01:00
Anatol Belski
89a4342507
fix incompatible pointers on 64-bit
2016-03-07 22:01:44 +01:00
Anatol Belski
f7e81fd9f1
fix double free and move temps into local scope
2016-03-07 16:38:47 +01:00
Anatol Belski
0fccddba75
add error check
2016-03-07 16:26:01 +01:00
Nikita Popov
860dc17ab7
Fixed bug #71724
2016-03-06 21:38:21 +01:00
Anatol Belski
be5bbe7068
fix ibase connection routine
...
followup on a7028d96
2016-03-04 12:26:25 +01:00
Tjerk Meesters
a7028d9671
Fix one zpp usage in interbase
...
Also small tweak to zpp REAME
2016-03-03 23:50:02 +01:00
Nikita Popov
5602f64213
Eliminate usages of _PP macros
...
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).
One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.
There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
2016-03-03 23:20:12 +01:00
Nikita Popov
3240dd93b3
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 19:27:35 +01:00
Christoph M. Becker
2d4ad66ff2
Fixed bug #69953
...
Added support for MKCALENDAR request method in CLI web server.
2016-03-03 19:22:38 +01:00
Nikita Popov
159602bd86
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 17:29:58 +01:00
Anton Blanchard
ccd215a517
Additional improvements to crypt() detection code
...
Reformat to normalize tabs vs spaces, return 1 if crypt.h not
defined, fix C99 compliance.
2016-03-03 17:28:34 +01:00
Nikita Popov
5a01605b4b
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 17:14:18 +01:00
Michael Orlitzky
08fce8e2c5
ext/standard/config.m4: fix crypt() test segfaults in >=glibc-2.17.
...
Starting with glibc-2.17, the crypt() function will report an EINVAL
and return NULL when the format of the "salt" parameter is
invalid. The current tests for crypt() pass its result to strcmp(),
causing segfaults when the value returned from crypt() is NULL.
This commit modifies the test programs to exit with failure when
crypt() returns NULL.
Reference: https://bugs.gentoo.org/show_bug.cgi?id=518964
2016-03-03 17:12:57 +01:00
Nikita Popov
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
James Titcumb
c4b188871e
Fix bug #71575 removing extra semicolons outside macros
2016-03-03 16:41:03 +01:00
Nikita Popov
5527c5b083
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-03 16:38:13 +01:00
Nikita Popov
a4e56194d7
Fix intermixed SKIPIF and XFAIL sections in test
2016-03-03 16:38:05 +01:00
Nikita Popov
bdd578fcbb
Disable upload_2G test on travis
2016-03-03 16:35:45 +01:00
Anatol Belski
4f0042bead
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
show correct MINFO with libpq >= 9.5.x
2016-03-02 17:05:05 +01:00
Anatol Belski
2399c64eaf
show correct MINFO with libpq >= 9.5.x
2016-03-02 17:03:20 +01:00
Dmitry Stogov
908b662f7f
PHP-7 zend_call_function() doesn't support symbol_table substitution
2016-03-02 16:56:39 +03:00
Dmitry Stogov
b6bbe33f05
Better fix for IS_INDIRECT support in zend_hash_merge()
2016-03-02 15:09:04 +03:00
Julien Pauli
914d33c40e
Going for 5.5.34
2016-03-02 11:02:42 +01:00
Dmitry Stogov
afedd4fd59
Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems)
2016-03-02 13:01:42 +03:00
Dmitry Stogov
ab800642df
Introduce zend_symtable_exists_ind() for API consistency
2016-03-02 11:53:47 +03:00
Stanislav Malyshev
1ce0ea7396
fix wddx merge
2016-03-02 00:02:33 -08:00
Stanislav Malyshev
6823ee923d
Update NEWS
2016-03-01 23:09:47 -08:00
Stanislav Malyshev
22d8e9aced
Merge branch 'PHP-7.0.4' into PHP-7.0
...
* PHP-7.0.4: (21 commits)
update NEWS
fix test file
Fix version
update NEWS
Update NEWS
Fix bug #71610 : Type Confusion Vulnerability - SOAP / make_http_soap_request()
Fix bug #71637 : Multiple Heap Overflow due to integer overflows
extend check for add_flag
Fixed another segfault with file_cache_only now
set version
fix nmake clean in phpize mode
Fixed segfault with file_cache_only
Fixed possible crash at PCRE on MSHUTDOWN
Fixed more synchronisation issues during SHM reload
Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string
sync with improvements in NEWS
Fixed process synchronisation problem, that may cause crashes after opcache restart
Fix bug #71498 : Out-of-Bound Read in phar_parse_zipfile()
fix ts buld
prep for 5.6.19RC1
...
Conflicts:
configure.in
main/php_version.h
2016-03-01 23:08:19 -08:00
Stanislav Malyshev
499c1e81a1
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:php-src:
limit size of result set so unit test runs reliably
2016-03-01 23:07:49 -08:00
Stanislav Malyshev
c69d80d701
update NEWS
2016-03-01 23:07:32 -08:00
Stanislav Malyshev
90a0cbd594
Merge branch 'PHP-5.6.19' into PHP-7.0.4
...
* PHP-5.6.19:
fix test file
Fix version
update NEWS
Update NEWS
Fix bug #71498 : Out-of-Bound Read in phar_parse_zipfile()
fix ts buld
prep for 5.6.19RC1
5.6.20 is next
Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize
Conflicts:
configure.in
ext/wddx/wddx.c
main/php_version.h
2016-03-01 23:01:48 -08:00
Stanislav Malyshev
b3bb1aacfe
Merge branch 'PHP-5.6.19' into PHP-5.6
...
* PHP-5.6.19:
fix test file
Fix version
Update NEWS
2016-03-01 22:56:08 -08:00
Stanislav Malyshev
6e6a556b8c
Merge branch 'PHP-5.5' into PHP-5.6.19
...
* PHP-5.5:
fix test file
Fix version
Update NEWS
2016-03-01 22:55:49 -08:00
Stanislav Malyshev
3c8ccdd9d3
fix test file
2016-03-01 22:55:02 -08:00
Stanislav Malyshev
54df59b729
Fix version
2016-03-01 22:47:27 -08:00
Stanislav Malyshev
ae3f132be1
Merge branch 'PHP-5.6.19' into PHP-5.6
...
* PHP-5.6.19:
update NEWS
Fix bug #71498 : Out-of-Bound Read in phar_parse_zipfile()
fix ts buld
prep for 5.6.19RC1
Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize
2016-03-01 22:42:16 -08:00
Stanislav Malyshev
a0bbac550e
update NEWS
2016-03-01 22:41:10 -08:00
Stanislav Malyshev
91990bbde0
Merge branch 'PHP-5.5.33' into PHP-5.6.19
...
* PHP-5.5.33:
Fix bug #71498 : Out-of-Bound Read in phar_parse_zipfile()
Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize
2016-03-01 22:40:00 -08:00
Stanislav Malyshev
153a44d6bb
Update NEWS
2016-03-01 22:37:23 -08:00
Stanislav Malyshev
07b6fc93b1
Fix bug #71610 : Type Confusion Vulnerability - SOAP / make_http_soap_request()
2016-03-01 22:32:38 -08:00
Stanislav Malyshev
9cabc99fce
Fix bug #71637 : Multiple Heap Overflow due to integer overflows
2016-03-01 22:32:38 -08:00
Xinchen Hui
db68b8ea54
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
limit size of result set so unit test runs reliably
2016-03-02 14:27:09 +08:00
Xinchen Hui
20add1e530
Merge branch 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src into PHP-5.6
...
* 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src :
limit size of result set so unit test runs reliably
2016-03-02 14:26:34 +08:00
Stanislav Malyshev
6f8585fc7d
Merge branch 'PHP-7.0.4' into PHP-7.0
...
* PHP-7.0.4:
Fix bug #71610 : Type Confusion Vulnerability - SOAP / make_http_soap_request()
Fix bug #71637 : Multiple Heap Overflow due to integer overflows
set versions
Conflicts:
configure.in
main/php_version.h
2016-03-01 22:22:47 -08:00
Xinchen Hui
3fb566f475
Fixed test ext/readline/tests/readline_read_history_error_001.phpt
...
This only pass with libedit
2016-03-02 12:29:15 +08:00
Xinchen Hui
2d4186dde7
Use hash_exists_ind in symbol table
2016-03-02 12:11:13 +08:00
Nikita Popov
726e87e142
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-02 00:37:40 +01:00
Nikita Popov
471540d285
Fix intermittent failure of bug_68819_002.phpt
...
The test used rand(32, 127) to select the character, however
chr(127) results in "data" instead of the expected result, so this
test would fail in something like 1% of the runs.
Replace rand() with fixed character "a".
2016-03-02 00:34:36 +01:00
Nikita Popov
dea2e1bc64
Merge branch 'PHP-5.6' into PHP-7.0
2016-03-01 23:32:47 +01:00
mpyw
0bbea60524
Fix bug #71694
...
Exports contants CURLM_ADDED_ALREADY.
2016-03-01 23:31:58 +01:00
Adam Baratz
2e18d438b0
limit size of result set so unit test runs reliably
2016-03-01 17:15:36 -05:00
Xinchen Hui
961c8d568d
Maybe we should introduce a symtable_exists_ind
2016-03-01 20:01:02 +08:00
Xinchen Hui
996760f104
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
remove unused vars
fix possible pointer truncation on win64
Updated NEWS
extend check for add_flag
LDAP - Added support to change the certificates verification
2016-03-01 19:20:57 +08:00
Xinchen Hui
186844be92
Fixed bug #71695 (Global variables are reserved before execution).
...
Instead of slow down hash_merge, we may also check the array(whether it
contains INDIRECT) outside of the loop, however, consisdering hash_merge
is not widly used, I prefer fix this in the current way to keep the
codes simple
2016-03-01 19:19:07 +08:00
Anatol Belski
655e5dd99d
remove unused vars
2016-03-01 10:52:49 +01:00
Anatol Belski
acbbe76d7b
fix possible pointer truncation on win64
2016-03-01 10:51:55 +01:00
Côme Bernigaud
afcce5ceca
Updated NEWS
2016-03-01 09:56:19 +01:00
Anatol Belski
bb80c00a00
extend check for add_flag
2016-03-01 09:37:50 +01:00
Anatol Belski
0df2575e9f
extend check for add_flag
2016-03-01 09:36:07 +01:00
Xinchen Hui
08af2f9a11
Fixed another segfault with file_cache_only now
2016-03-01 08:21:14 +01:00
Edwin Hoksberg
ba96506676
LDAP - Added support to change the certificates verification
2016-03-01 04:59:30 +01:00
Xinchen Hui
9fc0517328
Fixed another segfault with file_cache_only now
2016-03-01 10:50:56 +08:00
Nikita Popov
a6afaa9a85
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/phar/tar.c
2016-02-29 22:44:46 +01:00
Jos Elstgeest
50b4cafd28
Fixed bugs #71317 and #71504
...
If there are duplicate filenames in tar, the last one wins.
2016-02-29 22:34:35 +01:00
Anatol Belski
4a66b01639
set version
2016-02-29 20:44:00 +01:00
Anatol Belski
31dc08a904
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add test for bug #68957
2016-02-29 18:44:15 +01:00
Anatol Belski
d78220fb2c
add test for bug #68957
2016-02-29 18:43:03 +01:00
Anatol Belski
7a14a286bd
update NEWS
2016-02-29 18:26:48 +01:00
Anatol Belski
128cc4bc9d
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-02-29 18:26:08 +01:00
Anatol Belski
c49d9f0684
update NEWS
2016-02-29 18:25:16 +01:00
Anatol Belski
56ab4a6096
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed #54648 PDO::MSSQL forces format of datetime fields
2016-02-29 17:07:05 +01:00
Anatol Belski
53c036b30b
Fixed #54648 PDO::MSSQL forces format of datetime fields
...
adopted patch by steven dot lambeth at gmx dot de
2016-02-29 17:04:49 +01:00
Anatol Belski
44c3f1492f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
remove unneeded free parts
2016-02-29 16:30:33 +01:00
Anatol Belski
7816698580
remove unneeded free parts
...
See bug #71667 , free_statement already does the job
2016-02-29 16:26:46 +01:00
Anatol Belski
f806fedd80
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix leaks and add one more NULL check
add NULL check
fix C89 compat
fix arg type
2016-02-29 15:48:51 +01:00
Anatol Belski
d7fd614cc6
fix leaks and add one more NULL check
2016-02-29 15:38:42 +01:00
Anatol Belski
a310c3b484
add NULL check
2016-02-29 15:26:57 +01:00
Anatol Belski
efaafd45b4
fix C89 compat
2016-02-29 15:24:31 +01:00
Anatol Belski
35be4398d1
fix arg type
2016-02-29 15:23:53 +01:00
Anatol Belski
273bb7e9c0
fix nmake clean in phpize mode
2016-02-29 14:58:49 +01:00
Anatol Belski
9ccf3a0292
fix nmake clean in phpize mode
2016-02-29 11:00:09 +01:00
Xinchen Hui
b79b036a31
The test self should be fixed(maybe relates to env?)
...
Revert "Fixed test ext/readline/tests/readline_read_history_error_001.phpt"
This reverts commit 69e26f9f8f .
2016-02-29 15:19:18 +08:00
Xinchen Hui
d0b3a72cea
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
test fixes
update NEWS
Fix bug #71536 Access Violation crashes php-cgi.exe
2016-02-29 15:07:38 +08:00
Xinchen Hui
69e26f9f8f
Fixed test ext/readline/tests/readline_read_history_error_001.phpt
2016-02-29 15:07:19 +08:00
Xinchen Hui
6adfc20f04
Fixed segfault with file_cache_only
2016-02-28 15:54:01 +01:00
Anatol Belski
f738abab85
test fixes
2016-02-28 11:53:21 +01:00
Anatol Belski
0ac0604b30
update NEWS
2016-02-28 11:06:55 +01:00
Anatol Belski
93592a9c08
Fix bug #71536 Access Violation crashes php-cgi.exe
2016-02-28 11:02:01 +01:00
Xinchen Hui
8c053d44e4
Fixed segfault with file_cache_only
2016-02-28 11:50:06 +08:00
Dmitry Stogov
e2bf86fbfd
Fixed possible crash at PCRE on MSHUTDOWN
2016-02-26 15:14:20 +01:00
Dmitry Stogov
ecea7d3d35
Fixed more synchronisation issues during SHM reload
2016-02-26 15:14:01 +01:00
Dmitry Stogov
e65cc72cb6
Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string
2016-02-26 15:13:48 +01:00
Xinchen Hui
c299b272c7
Fixed bug #71660 (array_column behaves incorrectly after foreach by reference)
2016-02-25 16:07:22 +08:00
Nikita Popov
fd561505f4
Fix construction of AO with overloaded object error
...
a) Fix uses of zend_string in error message
b) Don't assign the overloaded object as the backing storage, that
sort of defeats the point. Instead leave the previous value.
2016-02-24 22:34:50 +01:00
Nikita Popov
0aa7163816
Fix AO object properties separation
2016-02-24 22:34:50 +01:00
Nikita Popov
079f2f7eb3
Forbid exchangeArray() during sorting
...
Previously this would leak.
2016-02-24 22:34:50 +01:00
Nikita Popov
b657554585
Fix typo in foreach_017.phpt
2016-02-24 22:34:50 +01:00
Dmitry Stogov
6842a3674d
Fixed possible crash at PCRE on MSHUTDOWN
2016-02-24 23:46:11 +03:00
Dmitry Stogov
43366f8ba8
Fixed more synchronisation issues during SHM reload
2016-02-24 21:15:53 +03:00
Nikita Popov
eb885e9d6e
Fix leak on assignment to illegal AO offset
2016-02-24 17:39:16 +01:00
Nikita Popov
ea02f57656
Don't use ht applyCount for AO sorting protection
...
Instead use the AOs own applyCount that just got freed up. Using the
apply count of the HashTable has various side effects, e.g. preventing
the ArrayObject from being dumped.
2016-02-24 17:18:07 +01:00
Nikita Popov
38db6ff306
Remove recursion checks from AO get_properties
...
These are pointless, there is no recursion (of that kind) happening
there.
2016-02-24 17:10:28 +01:00
Nikita Popov
3ea877ca15
Fix "Call to member function on unknown"
...
Should be "on null".
2016-02-24 17:00:25 +01:00
Nikita Popov
d1057cc139
Fixed bug #71470
...
Don't report hashtable iterator leaks on unclean shutdown, those
are expected.
2016-02-24 14:09:03 +01:00
Anatol Belski
bb2856b28c
fix NEWS
2016-02-24 12:29:23 +01:00
Remi Collet
17967ecda1
fix NEWS
2016-02-24 12:26:25 +01:00
Anatol Belski
f14c0cc43a
sync with improvements in NEWS
2016-02-24 12:23:26 +01:00
Anatol Belski
f463297c51
update NEWS
2016-02-24 12:06:35 +01:00
Anatol Belski
c9778d3eb9
Port patch and test for bug #47803 to 7.0
...
See ff115e285a
2016-02-24 12:03:21 +01:00
Anatol Belski
6e1862d0a8
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
add test for bug #47803
Fixed bug #47803
2016-02-24 11:57:15 +01:00
Anatol Belski
7d7325246c
update NEWS
2016-02-24 11:56:12 +01:00
Anatol Belski
90ad6e3c6c
add test for bug #47803
2016-02-24 11:49:02 +01:00
Anatol Belski
ff115e285a
Fixed bug #47803
...
Executing prepared statements is succesfull only for the first two statements
The reworked patch descends to the bug #69526 which is fixed by
this as well. The broken logic in the current code was, that
SQLDescribeParam was executed in odbc_execute every time. This piece
is now moved into odbc_prepare and the results are carried on in an
additional structure.
Since the ext/odbc headers are not being currently installed and the
corresponding structs like odbc_result are not used outside ext/odbc,
the binary compatibility persists. Executing SQLDescribeParam only once
in odbc_prepare is also an optimization as the filds usually won't
change that fast and thus requestind the descriptions on every
execution is not required.
2016-02-24 11:40:35 +01:00
Dmitry Stogov
ca779add4d
Fixed process synchronisation problem, that may cause crashes after opcache restart
2016-02-24 10:54:37 +01:00
Dmitry Stogov
0b9c87a02b
Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap())
2016-02-24 11:04:48 +03:00
Anatol Belski
01e85f3fdc
add test for bug #71171
2016-02-23 14:39:17 +01:00
Anatol Belski
cd75429ad8
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
make ext/odbc test credentials configurable
2016-02-23 14:22:06 +01:00
Anatol Belski
9623d2dd83
make ext/odbc test credentials configurable
2016-02-23 14:21:04 +01:00
Remi Collet
18e3b11d62
missing include
2016-02-22 18:45:18 +01:00
Remi Collet
0d57c06b2c
update bundled libzip to 1.1.2
2016-02-22 18:18:30 +01:00
Nikita Popov
78b29310bc
Remove check_std_props arg from get_hash_table
...
get_properties() is the only place using it, so handle it only
there.
2016-02-22 13:09:54 +01:00
Nikita Popov
3f5c80e8c2
Don't recurse into USE_OTHER checking STD_PROP_LIST
...
If STD_PROP_LIST is explicitly disabled in the constructor, it
should really be disabled.
2016-02-22 13:04:19 +01:00
Nikita Popov
6c2ca18fe0
Fix typo in previous commit
...
Happened to be correct because array is the first member, but
definitely not what I wanted...
2016-02-22 12:39:07 +01:00
Nikita Popov
fd6ac61064
Fix ArrayObject clone for certain USE_OTHER cases
...
We can't simply use HASH_OF, need to use the usual hash table
getter.
2016-02-22 12:35:00 +01:00
Nikita Popov
32e2801ff9
Use USE_OTHER for ArrayIterator cloning
...
intern->array should never be an array with refcount 2.
2016-02-22 12:35:00 +01:00
Remi Collet
e8385a60b3
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
cleanup $Id
2016-02-22 09:26:14 +01:00
Remi Collet
d20f1d8f1f
cleanup $Id
2016-02-22 09:26:00 +01:00
Stanislav Malyshev
eaf4e77190
Fix bug #71610 : Type Confusion Vulnerability - SOAP / make_http_soap_request()
2016-02-21 23:45:57 -08:00
Stanislav Malyshev
57b997ebf9
Fix bug #71637 : Multiple Heap Overflow due to integer overflows
2016-02-21 23:14:29 -08:00
Stanislav Malyshev
d25e67eee6
Fix bug #71629 : sync php_url_decode definition
2016-02-21 17:11:34 -08:00
Stanislav Malyshev
a6fdc5bb27
Fix bug #71498 : Out-of-Bound Read in phar_parse_zipfile()
2016-02-21 16:51:05 -08:00
Nikita Popov
0bd64b50b8
Fixed bug #71617
2016-02-21 13:00:37 +01:00
Remi Collet
2ecc0c1085
cleanup, ext/json is simple PHP now
2016-02-20 17:42:53 +01:00
Andrea Faulds
a50c31da19
Test that mt_rand() consistently produces the wrong results
...
See 6f6bd8ce53 and its revert,
a0724d3081 .
2016-02-18 22:35:44 +00:00
Dmitry Stogov
796e1629b0
Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string
2016-02-18 23:15:38 +03:00
Dmitry Stogov
25fbb06e2d
Better fix for bug #71622 (Strings used in pass-as-reference cannot be used to invoke C::$callable())
2016-02-18 23:14:46 +03:00
Anatol Belski
830b2bd368
refix broken 20ca0b89bd
2016-02-18 19:51:18 +01:00
Anatol Belski
9ac01060f9
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
2016-02-18 19:44:58 +01:00
Anatol Belski
7f7dce3cd6
update NEWS
2016-02-18 19:43:27 +01:00
Anatol Belski
bbaece44ee
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-02-18 19:43:03 +01:00
Anatol Belski
bbce94ed78
update NEWS
2016-02-18 19:42:18 +01:00
Anatol Belski
b3df715f50
add test for bug #71625 , 7 variant
2016-02-18 19:40:17 +01:00
Anatol Belski
4564b4c8f6
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add test for bug #71625
2016-02-18 19:39:30 +01:00
Anatol Belski
688b914217
add test for bug #71625
2016-02-18 19:38:39 +01:00
Rasmus Lerdorf
20ca0b89bd
Fix typo
2016-02-18 10:35:53 -08:00
Anatol Belski
9a5797976a
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71625 Crash in php7.dll with bad phar filename
2016-02-18 19:33:27 +01:00
Anatol Belski
0445abd547
Fixed bug #71625 Crash in php7.dll with bad phar filename
2016-02-18 19:32:08 +01:00
Anatol Belski
150e3804b9
update NEWS
2016-02-18 19:17:54 +01:00
Anatol Belski
148eba2afd
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-02-18 19:17:22 +01:00
Anatol Belski
f613d89501
update NEWS
2016-02-18 19:16:39 +01:00
Anatol Belski
4b5cce269b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Bug #71596 Segmentation fault on ZTS with date function (setlocale)
2016-02-18 19:14:22 +01:00
Anatol Belski
632fc51d98
Bug #71596 Segmentation fault on ZTS with date function (setlocale)
2016-02-18 19:13:07 +01:00
Bob Weinand
3ce6ad9d13
Fixed bug #71622 (Strings used in pass-as-reference cannot be used to invoke C::$callable())
2016-02-18 13:53:15 +01:00
Leigh
a0724d3081
Revert "Fix #71152 : mt_rand() returns the different values from original mt19937ar.c"
...
This reverts commit 6f6bd8ce53 .
`mt_rand()` is seedable with `mt_srand()` which means it can be used to (re)produce specific streams of numbers. All code (no matter how few instances that may be) that previously depended on this behaviour will no longer produce the same results.
This kind of change needs to be discussed before being committed.
2016-02-18 11:09:01 +00:00
Anatol Belski
68a51ae953
fix ts buld
2016-02-18 10:31:24 +01:00
Lior Kaplan
aa383d633e
Sort 7.0.4 extensions by name, merge FPM entries
2016-02-18 11:24:03 +02:00
Stanislav Malyshev
9afb29aa68
Remove TSRMLS_* from code, they are not used anymore
2016-02-17 22:44:05 -08:00
Stanislav Malyshev
cf842f1064
Remove TSRMLS_* from docs as it's not used anymore
2016-02-17 22:36:01 -08:00
Anatol Belski
491925bc53
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix ts buld
2016-02-18 07:12:42 +01:00
Anatol Belski
a329dc70e9
fix ts buld
2016-02-18 07:11:36 +01:00
Ferenc Kovacs
c3eeb8092a
prep for 5.6.19RC1
2016-02-18 01:26:18 +01:00
Ferenc Kovacs
e87ac6de31
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
5.6.20 is next
2016-02-18 00:32:15 +01:00
Ferenc Kovacs
4762ed4d27
5.6.20 is next
2016-02-18 00:31:18 +01:00
Bob Weinand
055b411218
Fix crash when advancing inside an internal function
...
This just happened in the "double ctrl+c" mode, when we halted inside an internal function; there was some code assuming a proper op_array
2016-02-17 20:27:46 +01:00
Dmitry Stogov
d228752939
Fixed process synchronisation problem, that may cause crashes after opcache restart
2016-02-17 13:58:05 +03:00
kusano
6f6bd8ce53
Fix #71152 : mt_rand() returns the different values from original mt19937ar.c
2016-02-17 11:32:59 +08:00
Anatol Belski
4e527d8201
set versions
2016-02-16 09:17:47 +01:00
Anatol Belski
837e2a912d
prepare next
2016-02-16 09:14:05 +01:00
Anatol Belski
7f5e8704bf
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
yet two test fixes in openssl in 5.6
2016-02-16 08:29:37 +01:00
Anatol Belski
343307000e
yet two test fixes in openssl in 5.6
2016-02-16 08:28:10 +01:00
Anatol Belski
84014cf733
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
improve test
2016-02-16 08:06:38 +01:00
Anatol Belski
974dea5e88
improve test
2016-02-16 08:05:16 +01:00
Xinchen Hui
0fccd154bd
Fixed bug #71603 (compact() maintains references in php7)
2016-02-16 11:02:57 +08:00
Bob Weinand
23b770f31f
Fixed bug #71601 (finally block not executed after yield from)
2016-02-15 22:37:21 +01:00
Anatol Belski
7faf625ff3
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix timelib compat with PHP5
2016-02-15 16:53:31 +01:00
Anatol Belski
11102e2653
Fix timelib compat with PHP5
...
Windows builds in PHP5 are always using long which is 32-bit even
in 64-bit build. Thus in PHP5, timelib_long and the company have
to always evaluate to a 32-bit.
2016-02-15 16:50:42 +01:00
Anatol Belski
64b16deaba
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Backported fix for bug #71525
2016-02-15 15:15:52 +01:00
Anatol Belski
633fb2d0e8
Backported fix for bug #71525
2016-02-15 15:14:23 +01:00
Dmitry Stogov
388ab976b5
Fixed possible memory leak
2016-02-15 16:40:05 +03:00
Dmitry Stogov
5c4b4d11be
Added missing semicolon
2016-02-15 16:37:27 +03:00
Stanislav Malyshev
c1355152db
More fixing for bug #71540
2016-02-15 01:53:02 -08:00
Stanislav Malyshev
e34a7a1b08
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Conflicts:
ext/xsl/xsltprocessor.c
2016-02-15 00:09:30 -08:00
Stanislav Malyshev
cf0cf5b507
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
2016-02-15 00:09:09 -08:00
Stanislav Malyshev
c11b23c465
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
2016-02-15 00:08:18 -08:00
Anatol Belski
9b277e6cff
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix dir separator in test
2016-02-15 09:01:59 +01:00
Anatol Belski
c94ee2e0c8
fix dir separator in test
2016-02-15 09:00:07 +01:00
Anatol Belski
a3927fa7f5
fix dir separator in test
2016-02-15 08:58:20 +01:00
Anatol Belski
53639c44df
make sure the tests always uses same tz
2016-02-15 08:38:55 +01:00
Xinchen Hui
afe0ddf6dd
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
fixed news entry
fix NEWS entry
update NEWS
Fix bug #71525
2016-02-15 15:32:52 +08:00
Anatol Belski
8f5cdca9c4
fixed news entry
2016-02-15 08:27:41 +01:00
Anatol Belski
9746f2e9da
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix NEWS entry
2016-02-15 08:27:17 +01:00
Xinchen Hui
e917402f05
Fixed typo (I think it should be a typo)
2016-02-15 15:26:44 +08:00
Anatol Belski
199c0ec48d
fix NEWS entry
2016-02-15 08:25:23 +01:00
Anatol Belski
e027f16e94
update NEWS
2016-02-15 08:21:46 +01:00
Sean DuBois
f31e0cd334
Fix bug #71525
...
timelib_time->timelib_rel_time is mutated by date_modify, and because it is never zero'ed out
it latters causes other date operations to fail (like date_date_set)
2016-02-15 08:19:07 +01:00
Stanislav Malyshev
b1bd4119bc
Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize
2016-02-14 22:34:39 -08:00
Xinchen Hui
d0649a8441
Update NEWS
2016-02-15 13:24:39 +08:00
Mickaël
0c2e184eac
fpm: call zend_signal_init() in child
...
This addresses bug #71269 .
When an fpm child handles more than one request, zend_signal_startup() will
override the saved signal handlers with the internal zend handlers set from the
previous request, causing a SIGQUIT signal to result in a core dump rather than
gracefully exiting (the expected behaviour).
This is fixed by adding a call to zend_signal_init() after setting the
signal handlers in the child. The same technique is used in the apache SAPI
module in commit fd5a756ad4 which addresses
bug #61083 .
2016-02-15 13:23:37 +08:00
Xinchen Hui
0e363e90a4
Update NEWS
2016-02-15 10:37:37 +08:00
Xinchen Hui
8974e4c781
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Update NEWS: "Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
Fix use-after-free of ZCG(cwd) in Zend Optimizer
Conflicts:
ext/opcache/ZendAccelerator.c
2016-02-15 10:32:50 +08:00
Xinchen Hui
2b850e1565
Update NEWS: "Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
2016-02-15 10:31:37 +08:00
Xinchen Hui
5e152f54ae
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:/php-src:
update NEWS
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
Check length of string before comparing to :memory:
Fix bounds check in strip_tags()
Fix test description
FIx bug #71569
2016-02-15 10:29:28 +08:00
Anatol Belski
1740648312
updated NEWS
2016-02-14 20:54:13 +01:00
Anatol Belski
aabb6b70c5
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-02-14 20:53:41 +01:00
Anatol Belski
aa10fc6092
update NEWS
2016-02-14 20:52:47 +01:00
Anatol Belski
724ee19111
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
2016-02-14 20:49:03 +01:00
Anatol Belski
ce4a2f0fc6
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
2016-02-14 20:47:23 +01:00
Anatol Belski
9bef2212aa
cleanup duplicated var
2016-02-14 17:20:37 +01:00
Anatol Belski
8289f11390
fix file lists with subdirs passed to EXTENSION()
...
The underlying place responsible is the ADD_SOURCES() function. With
this, the calls like
EXTENSION("hello", "sub0/file0.c sub1/file1.c", ...)
are working correctly. Same for
ADD_SOURCES("some/dir", "sub0/file0.c sub1/file1.c", ...)
2016-02-14 17:15:20 +01:00
Nikita Popov
c9357f82d3
Format string fixes
...
Conflicts:
ext/pgsql/pgsql.c
2016-02-14 14:45:53 +01:00
Nikita Popov
5983378364
Fix format attributes in ZTS
2016-02-14 14:44:27 +01:00
Nikita Popov
30d5432bfe
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/sqlite3/sqlite3.c
2016-02-13 18:03:06 +01:00
Nikita Popov
fece24f8f4
Check length of string before comparing to :memory:
2016-02-13 18:01:50 +01:00
Nikita Popov
f43fe8cb4c
Merge branch 'PHP-5.6' into PHP-7.0
2016-02-13 17:48:17 +01:00
Nikita Popov
4e0134c661
Fix bounds check in strip_tags()
2016-02-13 17:47:30 +01:00
Nikita Popov
adcdb4f7ba
Fix test description
2016-02-13 17:46:24 +01:00
Nikita Popov
7f474086e3
Fix extract() overwriting its own argument
...
Already covered by bug46873.phpt under valgrind.
2016-02-13 17:39:26 +01:00
Nikita Popov
70c8db08c6
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/pdo_mysql/mysql_driver.c
2016-02-13 15:21:16 +01:00
Nikita Popov
bc419fee5c
FIx bug #71569
...
convert_to_string() may result in an interned string.
2016-02-13 15:17:51 +01:00
Nikita Popov
ccc06e252b
Forbid yield from in by-reference generators
...
The current yield from implementation doesn't support by-ref
yields. It's likely not worthwhile to actually implement this,
but we should at least keep the door open for the future by
issuing a compile error.
Refs bug #71252 .
2016-02-12 17:55:29 +01:00
Nikita Popov
9cebdc5d47
Fix yield-by-ref of constant
...
Typo in the condition...
2016-02-11 16:32:45 +01:00
Nikita Popov
1322672c0b
Fix dangling send target when using yield from
...
Also drop some unnecessary TRY_DELREFs -- leftovers from the days
when null was refcounted.
2016-02-11 16:25:16 +01:00
Anatol Belski
95a47ab556
fix version header
2016-02-11 16:23:19 +01:00
Bob Weinand
1a01a5ec83
Fixed inherited functions from unspecified files being included in phpdbg_get_executable()
...
See also https://github.com/krakjoe/phpdbg/issues/152
2016-02-11 06:42:51 +01:00
Nikita Popov
aa3f44a395
Crude generator GC for value/key/retval
...
These values remain live after the generator has been closed, so
they are particularly susceptible to leaking cycles.
2016-02-10 19:03:02 +01:00
Joe Watkins
daf3d0c875
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-02-10 12:58:19 +00:00
Joe Watkins
3ac63df9bc
be more precise about the meaning of -n
2016-02-10 12:57:48 +00:00
Yussuf Khalil
35f6f9b0db
Fix use-after-free of ZCG(cwd) in Zend Optimizer
2016-02-10 10:33:57 +01:00
Xinchen Hui
aeb5319336
Update NEWS
2016-02-09 23:36:15 +08:00
Xinchen Hui
33417bf409
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/zip/php_zip.c
2016-02-09 23:35:55 +08:00
Xinchen Hui
c339d5217a
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2016-02-09 23:33:30 +08:00
Xinchen Hui
f45752eb83
Fixed bug #71561 (NULL pointer dereference in Zip::ExtractTo)
2016-02-09 23:32:20 +08:00
Xinchen Hui
a219fc1753
Fixed bug (Low probability segfault in zend_arena)
2016-02-09 12:20:11 +08:00
Lior Kaplan
2aa585a505
Add entry for re-fix of #70976 in commit 14e4d393
2016-02-08 20:31:08 +02:00
Lior Kaplan
fb7d673ef2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Align spacing in make install messages
Add entry for re-fix of #70976 in commit 14e4d393
2016-02-08 20:29:24 +02:00
Lior Kaplan
6772fbff62
Align spacing in make install messages
2016-02-08 20:27:19 +02:00
Leigh
3ef57f8d5d
Fixed memory leak in curl_getinfo()
...
The "v ? v" in the CAASTR macro caused zend_string_copy to be
called twice
2016-02-08 11:36:14 +00:00
Xinchen Hui
0490d4a404
Happy Year of Monkey (Forgot test of #71537 )
2016-02-08 10:22:16 +08:00
Lior Kaplan
879671aeae
Add entry for re-fix of #70976 in commit 14e4d393
2016-02-07 20:19:31 +02:00
Xinchen Hui
336e39f2b1
Fixed bug #71537 (PCRE segfault from Opcache)
2016-02-07 23:19:24 +08:00
Nikita Popov
9f82f21d01
Fix bug #71529
2016-02-06 16:43:28 +01:00
Xinchen Hui
d645706547
Online test
2016-02-05 19:56:23 +08:00
Xinchen Hui
e724e54305
Update NEWS
2016-02-05 19:51:58 +08:00
Xinchen Hui
095096c7ab
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/curl/interface.c
2016-02-05 19:51:33 +08:00
Xinchen Hui
5fdfab743d
Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec)
2016-02-05 19:49:26 +08:00
Lior Kaplan
3311f8e840
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Align NEWS entry format
2016-02-05 01:08:22 +02:00
Lior Kaplan
b680426bd3
Align NEWS entry format
2016-02-05 01:08:01 +02:00
Lior Kaplan
8442a1cc4e
Align NEWS entry format
2016-02-05 00:50:25 +02:00
Ferenc Kovacs
374c1fec9c
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-02-04 20:41:13 +01:00
Ferenc Kovacs
8c1c12a2e2
update NEWS
2016-02-04 20:40:54 +01:00
Anatol Belski
2941c498fd
add missin NEWS entry
2016-02-04 18:09:35 +01:00
Jakub Zelenka
1ff88d3945
Merge branch 'PHP-5.6' into PHP-7.0
2016-02-04 16:54:44 +00:00
Jakub Zelenka
feab5e6fa0
Split and clean up OpenSSL X509 tests
2016-02-04 16:51:36 +00:00
Hieu Le
ace71b4c5f
Fix bug #71501
2016-02-04 11:44:56 +01:00
Jakub Zelenka
cdf99ffc69
Merge branch 'PHP-5.6' into PHP-7.0
2016-02-03 16:22:39 +00:00
Jakub Zelenka
1f3906c1ce
Rename and clean up OpenSSL tests
2016-02-03 16:20:27 +00:00
Antony Dovgal
3a2c9e6e1d
fix build
...
sorry about that =\
2016-02-03 18:03:28 +03:00
Antony Dovgal
52e120fa90
use correct element size, avoid reading stack
2016-02-03 15:14:10 +03:00
Antony Dovgal
6f81e95c33
check length first, prevent out-of-bounds read
2016-02-03 14:49:16 +03:00
Ferenc Kovacs
5154a48d37
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-02-03 01:08:09 +01:00
Ferenc Kovacs
e0332ea1a9
update NEWS
2016-02-03 01:07:34 +01:00
Julien Pauli
0d1d814e1a
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Updated NEWS
Fix #70720
Conflicts:
ext/standard/string.c
ext/standard/tests/strings/bug70720.phpt
2016-02-02 18:17:16 +01:00
Julien Pauli
ed80ca00f4
Updated NEWS
2016-02-02 18:14:57 +01:00
Julien Pauli
6b0b29edd6
Fix #70720
2016-02-02 18:09:54 +01:00
Anatol Belski
f7c3f54be9
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add error check to sysconf call
Going for 5.5.33 now
2016-02-02 14:27:30 +01:00
Anatol Belski
2c691f06b5
reapply the sysconf error check patch
2016-02-02 14:26:58 +01:00
Anatol Belski
b837f205ca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add error check to sysconf call
Going for 5.5.33 now
Conflicts:
configure.in
main/php_version.h
2016-02-02 14:22:31 +01:00
Anatol Belski
377d353c9f
add error check to sysconf call
2016-02-02 14:19:10 +01:00
Derick Rethans
b573658092
Updated to version 2016.1 (2016a)
2016-02-02 10:34:05 +00:00
Derick Rethans
0c6dbff900
Empty merge
2016-02-02 10:34:05 +00:00
Derick Rethans
43fee6c6a1
Updated to version 2016.1 (2016a)
2016-02-02 10:34:03 +00:00
Julien Pauli
7d875fb9df
Going for 5.5.33 now
2016-02-02 10:42:49 +01:00
Anatol Belski
0d0978dfa6
fix dir separator
2016-02-02 09:56:57 +01:00
Anatol Belski
1c2d45d2d1
fix directory separator in test
2016-02-02 09:52:07 +01:00
Anatol Belski
0ec1207d74
update libs version
2016-02-02 09:03:40 +01:00
Anatol Belski
cec46864fc
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update libs version
2016-02-02 09:03:22 +01:00
Anatol Belski
bf974312d1
update libs version
2016-02-02 09:02:12 +01:00
Anatol Belski
c48a188df2
update NEWS
2016-02-02 08:32:28 +01:00
Stanislav Malyshev
c631f1ee2b
Merge branch 'PHP-7.0.3' into PHP-7.0
...
* PHP-7.0.3: (35 commits)
fix tests
update NEWS
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71475 : openssl_seal() uninitialized memory usage
Fixed bug #71488 : Stack overflow when decompressing tar archives
fix tests
fix wrong gc sequence
revert the API string as well
update NEWS
Revert "Fix #70720 "
sync NEWS
reset ext/session to the state of 7.0.2
update NEWS
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
...
Conflicts:
configure.in
ext/session/tests/bug69111.phpt
main/php_version.h
2016-02-01 20:45:49 -08:00
Stanislav Malyshev
0fca0d9f42
fix tests
2016-02-01 20:23:21 -08:00
Stanislav Malyshev
7ffb976104
update NEWS
2016-02-01 20:23:06 -08:00
Stanislav Malyshev
e231830f16
Merge branch 'PHP-5.6.18' into PHP-7.0.3
...
* PHP-5.6.18:
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71488 : Stack overflow when decompressing tar archives
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
Fix bug #71459 - Integer overflow in iptcembed()
prepare 5.6.18RC1
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
improve fix for bug #71201
Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
Fix bug #71391 : NULL Pointer Dereference in phar_tar_setupmetadata()
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Fix bug #71335 : Type Confusion in WDDX Packet Deserialization
Fix bug #71354 - remove UMR when size is 0
Conflicts:
configure.in
ext/phar/dirstream.c
ext/phar/phar_object.c
ext/phar/tar.c
ext/standard/exec.c
ext/standard/iptc.c
ext/standard/math.c
ext/standard/streamsfuncs.c
ext/wddx/wddx.c
main/php_version.h
main/streams/memory.c
2016-02-01 20:00:01 -08:00
Stanislav Malyshev
0007a695c8
Merge commit 'ca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62' into PHP-7.0.3
...
* commit 'ca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62':
Upgrade bundled PCRE to 8.38
Fixed NEWS file entry
fix the fix for bug #70976 (imagerotate)
Conflicts:
ext/pcre/pcrelib/config.h
2016-02-01 19:35:59 -08:00
Stanislav Malyshev
877823e209
Merge remote-tracking branch 'origin/PHP-7.0.3' into PHP-7.0.3
...
* origin/PHP-7.0.3:
fix tests
fix wrong gc sequence
revert the API string as well
update NEWS
Revert "Fix #70720 "
sync NEWS
reset ext/session to the state of 7.0.2
improve fix for bug #71201
set versions to 7.0.3RC1
fix test for 7.0, OpenSSL >= 1.0.2 disables SSLv2 by default
fork test
fix test
fork test
fork test for win32
fork test
Use SUCCESS/FAILURE
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
Update NEWS
Fixed bug 71397 (mb_send_mail segmentation fault)
2016-02-01 19:32:06 -08:00
Stanislav Malyshev
41be90d95b
Merge branch 'PHP-5.6.18' into PHP-5.6
...
* PHP-5.6.18:
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71488 : Stack overflow when decompressing tar archives
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
Fix bug #71459 - Integer overflow in iptcembed()
prepare 5.6.18RC1
Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
Fix bug #71391 : NULL Pointer Dereference in phar_tar_setupmetadata()
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Fix bug #71335 : Type Confusion in WDDX Packet Deserialization
Fix bug #71354 - remove UMR when size is 0
Conflicts:
configure.in
main/php_version.h
2016-02-01 19:16:34 -08:00
Stanislav Malyshev
24167095a5
Merge branch 'PHP-5.5' into PHP-5.6.18
...
* PHP-5.5:
fix tests
fix NEWS
update NEWS
2016-02-01 19:15:19 -08:00
Stanislav Malyshev
2a7d8c0a06
fix tests
2016-02-01 18:58:02 -08:00
Stanislav Malyshev
e7051cb47a
fix NEWS
2016-02-01 18:47:56 -08:00
Stanislav Malyshev
20c38facfd
Update NEWS
2016-02-01 18:47:28 -08:00
Stanislav Malyshev
0d86a98c31
update NEWS
2016-02-01 18:44:33 -08:00
Stanislav Malyshev
309ead112f
Merge branch 'PHP-5.5.32' into PHP-5.6.18
...
* PHP-5.5.32:
Fixed bug #71488 : Stack overflow when decompressing tar archives
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
Fix bug #71459 - Integer overflow in iptcembed()
Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
Fix bug #71391 : NULL Pointer Dereference in phar_tar_setupmetadata()
Fix bug #71335 : Type Confusion in WDDX Packet Deserialization
Fix bug #71354 - remove UMR when size is 0
2016-02-01 18:32:31 -08:00
Stanislav Malyshev
2f1ce4f209
Merge branch 'PHP-5.5' into PHP-5.6.18
...
* PHP-5.5:
Upgrade bundled PCRE to 8.38
Fixed NEWS file entry
fix the fix for bug #70976 (imagerotate)
2016-02-01 18:32:14 -08:00
Stanislav Malyshev
5bde5a0a2e
Merge remote-tracking branch 'origin/PHP-5.6.18' into PHP-5.6.18
...
* origin/PHP-5.6.18:
prepare 5.6.18RC1
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
improve fix for bug #71201
fork test
fix test
fork test
fork test for win32
fork test
Use SUCCESS/FAILURE
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
Fix header file include
Fixed bug #69111 (Crash in SessionHandler::read()). Made session save handler abuse much harder than before.
2016-02-01 18:31:57 -08:00
Stanislav Malyshev
b5ef8ed168
Merge branch 'PHP-5.5' into PHP-5.5.32
...
* PHP-5.5:
Upgrade bundled PCRE to 8.38
Fixed NEWS file entry
2016-02-01 18:28:49 -08:00
Anatol Belski
2764586c6d
fix extensions path for nmake install
2016-02-01 15:42:32 +01:00
Anatol Belski
a5474c7ac0
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix extensions path for nmake install
2016-02-01 15:41:04 +01:00
Anatol Belski
a01fd45d15
fix extensions path for nmake install
2016-02-01 15:38:53 +01:00
Antony Dovgal
8b023e9192
use correct pointer in the math
2016-02-01 16:33:04 +03:00
Stanislav Malyshev
916c1fb3af
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Upgrade bundled PCRE to 8.38
Fixed NEWS file entry
fix the fix for bug #70976 (imagerotate)
Conflicts:
ext/pcre/pcrelib/config.h
2016-01-31 21:39:24 -08:00
Stanislav Malyshev
00788f9cfb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Upgrade bundled PCRE to 8.38
Fixed NEWS file entry
fix the fix for bug #70976 (imagerotate)
2016-01-31 21:06:31 -08:00
Stanislav Malyshev
ca02d9c2d6
Upgrade bundled PCRE to 8.38
2016-01-31 20:37:47 -08:00
Stanislav Malyshev
33b1fbbb5c
Fixed bug #71475 : openssl_seal() uninitialized memory usage
2016-01-31 20:18:46 -08:00
Stanislav Malyshev
07c7df68bd
Fixed bug #71488 : Stack overflow when decompressing tar archives
2016-01-31 19:37:56 -08:00
Jakub Zelenka
265ccef39b
Rename private.key to private_rsa_1024.key in new openssl_seal test
2016-01-31 18:13:37 +00:00
Jakub Zelenka
d8d20151c3
Merge branch 'PHP-5.6' into PHP-7.0
2016-01-31 14:40:20 +00:00
Jakub Zelenka
ef356912b3
Rewrite OpenSSL SPKI tests to speed them up
...
Also fix some CS issue and naming
2016-01-31 14:28:13 +00:00
Jakub Zelenka
e93ab05489
Add private RSA keys with 2048 and 4096 bit long modulus
2016-01-31 13:57:00 +00:00
Jakub Zelenka
148d013323
Rename private.key to private_rsa_1024.key
2016-01-31 13:54:16 +00:00
Xinchen Hui
e062759401
Fixed bug #71485 (Return typehint on interanal func causes Fatal error when it throws exception).
2016-01-29 22:05:52 -08:00
Xinchen Hui
3dadd654cf
Also WIN32 side
2016-01-29 20:38:50 -08:00
Xinchen Hui
01ff25970f
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2016-01-29 20:37:14 -08:00
Robin McCorkell
7806553fd3
Properly read any remaining data when closing FastCGI socket
2016-01-29 20:36:52 -08:00
Anatol Belski
b947aff98d
yet one revert
2016-01-29 21:43:14 +01:00
Anatol Belski
ac22f71477
Revert "adjust test for 7.0"
...
This reverts commit 7fdb019e66 .
2016-01-29 21:27:22 +01:00
Anatol Belski
6891e6abdf
Revert "refix #69111 and one related test"
...
This reverts commit 80f7b01258 .
Conflicts:
ext/session/mod_files.c
2016-01-29 20:59:58 +01:00
Anatol Belski
3d90531d1e
Revert "fix yet another leak"
...
This reverts commit 39084ccc68 .
2016-01-29 20:58:00 +01:00
Anatol Belski
d1d3c0832e
add XFAIL
2016-01-29 20:57:05 +01:00
Anatol Belski
ebcfe7618d
Revert "refix #69111 and one related test"
...
This reverts commit 80f7b01258 .
2016-01-29 20:50:14 +01:00
Anatol Belski
7f977c13dc
Revert "fix tests"
...
This reverts commit d964ccba40 .
2016-01-29 20:49:52 +01:00
Anatol Belski
57d9797b6f
Revert "fix leak in 7.0"
...
This reverts commit ee49df011c .
2016-01-29 20:46:47 +01:00
Anatol Belski
6cc1c962f7
remove NEWS entry
2016-01-29 20:40:27 +01:00
Anatol Belski
16a99c6368
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add XFAIL
Revert "fix leak in 5.6"
2016-01-29 20:37:46 +01:00
Anatol Belski
b7dadfae87
add XFAIL
2016-01-29 20:36:11 +01:00
Anatol Belski
40b9f52c2c
Revert "fix leak in 5.6"
...
This reverts commit fa548e5ca9 .
2016-01-29 20:33:39 +01:00
Anatol Belski
80f7b01258
refix #69111 and one related test
...
It is the least evil as the test just reduces the fail path. 5.6 seems
still broken in this regard, a backport should follow if travis is happy.
2016-01-29 19:55:50 +01:00
Guillaume Outters
d01566fe2f
opcache config.m4: Use = for comparison
...
HAVE_OPCACHE_FILE_CACHE and HAVE_HUGE_CODE_PAGES where not
correctly set on old systems (e.g. FreeBSD 8), due to a PHPism in
config.m4. Using the standard shell operator = instead of == makes
the configure script produce the correct output.
2016-01-29 17:02:21 +01:00
Guillaume Outters
10b2172f01
phpdbg config.m4: make it detectable by old shells
...
--enable-phpdbg is not detected on old systems (e.g.: stock FreeBSD 8), due to a PHPism in config.m4 (use of == operator).
Replacing == with the historic = makes it pass.
2016-01-29 17:01:04 +01:00
Anatol Belski
6ba7acee5c
fix tests
2016-01-29 16:34:10 +01:00
Anatol Belski
d964ccba40
fix tests
2016-01-29 16:32:27 +01:00
Anatol Belski
39084ccc68
fix yet another leak
2016-01-29 16:03:33 +01:00
Derick Rethans
eae5914554
Merge branch 'PHP-5.6' into PHP-7.0
2016-01-29 15:34:47 +01:00
Derick Rethans
deba5275eb
Added entry to NEWS
2016-01-29 15:34:36 +01:00
Derick Rethans
3523c0a45f
Merge branch 'PHP-5.6' into PHP-7.0
2016-01-29 15:30:31 +01:00
Derick Rethans
1a86825688
Use the new timelib function for comparing times
2016-01-29 15:28:11 +01:00
Willem-Jan
2aeef4e539
Test + support for negative timestamps with microtime
2016-01-29 15:22:22 +01:00
Willem-Jan
1bbbc47e79
Also test against equality
2016-01-29 15:22:22 +01:00
Willem-Jan
5879721936
Compare agaist fraction when sse are equal
2016-01-29 15:22:22 +01:00
Willem-Jan
a0237259e9
Added test for comparing dates with microseconds
2016-01-29 15:22:22 +01:00
Derick Rethans
822ca45220
Merge in changes in timelib 2016.01
2016-01-29 15:21:55 +01:00
Anatol Belski
7421acfc90
fix wrong gc sequence
2016-01-29 15:20:44 +01:00
Anatol Belski
d2c752d7e9
fix wrong gc sequence
2016-01-29 15:18:59 +01:00
Anatol Belski
ee49df011c
fix leak in 7.0
2016-01-29 14:48:05 +01:00
Anatol Belski
a0d7a66756
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix leak in 5.6
2016-01-29 13:59:28 +01:00
Anatol Belski
fa548e5ca9
fix leak in 5.6
2016-01-29 13:56:11 +01:00
Anatol Belski
b783d0b338
revert the API string as well
2016-01-29 13:24:09 +01:00
Anatol Belski
d9eea2c209
revert the API string as well
2016-01-29 12:52:41 +01:00
Anatol Belski
45f5ae8943
update NEWS
...
Fix for #70720 is postphoned to 7.0.4
2016-01-29 12:46:44 +01:00
Anatol Belski
dd3d10cef1
update NEWS
2016-01-29 12:42:46 +01:00
Anatol Belski
47af41b785
Revert "Fix #70720 "
...
This reverts commit ff7ed9021c .
2016-01-29 12:41:43 +01:00
Anatol Belski
7fdb019e66
adjust test for 7.0
2016-01-29 12:29:41 +01:00
Anatol Belski
a068047f62
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add test for bug #69111
2016-01-29 12:29:05 +01:00
Anatol Belski
4b0feeb8fa
add test for bug #69111
2016-01-29 12:27:35 +01:00
Anatol Belski
e92abf850e
sync NEWS
2016-01-29 11:42:57 +01:00
Anatol Belski
87a671bba0
reset ext/session to the state of 7.0.2
2016-01-29 11:41:45 +01:00
Anatol Belski
9475243310
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-01-29 11:28:38 +01:00
Anatol Belski
efb667e683
update NEWS
2016-01-29 11:27:44 +01:00
Anatol Belski
cb6d045d11
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
refix bug #69111 , crash in 5.6 only
2016-01-29 11:25:32 +01:00
Anatol Belski
25108babdb
refix bug #69111 , crash in 5.6 only
2016-01-29 11:24:19 +01:00
Remi Collet
83947f4282
NEWS
2016-01-29 10:24:40 +01:00
Remi Collet
c0802af52c
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
NEWS
Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
2016-01-29 10:24:15 +01:00
Remi Collet
a81cb64a96
NEWS
2016-01-29 10:23:42 +01:00
Remi Collet
07d2dcdf09
Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
...
Only needed with Apache version < 2.4.12 (ex RHEL-7)
2016-01-29 10:20:42 +01:00
Anatol Belski
9599acdef6
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-01-29 08:43:13 +01:00
Anatol Belski
d77b28507c
update NEWS
2016-01-29 08:42:54 +01:00
Anatol Belski
8ee1ae9748
update NEWS
2016-01-29 08:41:25 +01:00
Anatol Belski
b858224b88
reset ext/session to the state of 7.0.2
2016-01-29 08:37:27 +01:00
Anatol Belski
74e51b3513
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
reset the ext/session to the state of 5.6.17
2016-01-29 08:37:05 +01:00
Anatol Belski
ae6e139c77
reset the ext/session to the state of 5.6.17
2016-01-29 08:33:09 +01:00
Anatol Belski
fc53d7408b
update NEWS
2016-01-28 13:58:48 +01:00
Anatol Belski
a1c675e3f2
update NEWS
2016-01-28 13:57:44 +01:00
Anatol Belski
686a17893a
add missing headers for SIZE_MAX
2016-01-28 13:46:34 +01:00
Anatol Belski
f4d7bbf4ac
backport the escapeshell* functions hardening branch
2016-01-28 13:45:43 +01:00
Anatol Belski
828364e59c
add tests
2016-01-28 13:27:26 +01:00
Julien Pauli
df78eacc2f
Fixed NEWS file entry
2016-01-28 12:47:53 +01:00
Anatol Belski
89ccd8ad56
Merge branch 'escapeshell_hardened_70' into PHP-7.0.3
...
* escapeshell_hardened_70:
extend _SC_ARG_MAX usage onto platforms where it's available
Fixed bug #71039 exec functions ignore length but look for NULL termination
Follow up on bug #71270
2016-01-28 12:08:49 +01:00
Anatol Belski
a9048d101f
extend _SC_ARG_MAX usage onto platforms where it's available
2016-01-28 12:06:33 +01:00
Dmitry Stogov
6039d2d914
Fixed bug #71474 (Crash because of VM stack corruption on Magento2).
2016-01-28 11:41:15 +03:00
Stanislav Malyshev
88bd7cb418
Use safe alloc functions when calculations are made on sizes.
...
Fixes bug #71449 , bug #71450
2016-01-26 22:33:51 -08:00
Stanislav Malyshev
f379142d66
Fix bug #71459 - Integer overflow in iptcembed()
2016-01-26 17:30:50 -08:00
Stanislav Malyshev
54c210d2ea
Fix bug #71459 - Integer overflow in iptcembed()
2016-01-26 17:26:52 -08:00
Xinchen Hui
6239e4410d
Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)
2016-01-26 16:22:31 +08:00
Xinchen Hui
bdbb32158c
Added test for bug #71443
2016-01-26 15:59:18 +08:00
Xinchen Hui
9ff08ae17c
Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)
2016-01-26 15:57:39 +08:00
Jakub Zelenka
67c1921e2b
Merge branch 'PHP-5.6' into PHP-7.0
2016-01-25 17:19:18 +00:00
Jakub Zelenka
a63d0f55da
Fix memory leak with not freeing OpenSSL errors
2016-01-25 16:50:16 +00:00
Antony Dovgal
c140bbb5db
check for NULL and avoid crashes
2016-01-25 14:30:33 +03:00
Xinchen Hui
e7f2c5bd6a
Fixed bug #71442 (forward_static_call crash)
2016-01-25 12:13:22 +08:00
Xinchen Hui
b68d525f16
Update libmagic.patch for PHP-7.0
2016-01-25 11:45:32 +08:00
Xinchen Hui
4cb47bd3bd
Fixed compiler warnings
2016-01-25 11:45:14 +08:00
Xinchen Hui
da7f42de38
Fixed bug #71434 (finfo throws notice for specific python file)
2016-01-25 11:40:08 +08:00
Xinchen Hui
47e7662a13
Update libmagic.patch for PHP-5.6
2016-01-25 11:25:04 +08:00
Xinchen Hui
a458a4fdc1
Fixed bug #7143 (finfo throws notice for specific python file)
...
There seems be a bug while it was changed from regexec to
preg_match_impl:
https://github.com/php/php-src/commit/46906925#diff-56e765972d18c84894ea061cfe58076aR1757
2016-01-25 11:24:44 +08:00
Bob Weinand
001ce475ee
Fixed bug #71441 (Typehinted Generator with return in try/finally crashes)
2016-01-24 19:55:16 +01:00
Xinchen Hui
ae122bf7ad
Fixed warning of incompatible pointer
2016-01-23 22:49:15 -08:00
Bob Weinand
65ef7f8c33
Use uint64_t for flags (warning)
2016-01-23 18:16:57 +01:00
Ferenc Kovacs
ec85410eb2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
re-arrange NEWS
2016-01-21 02:25:23 +01:00
Ferenc Kovacs
848de651a2
re-arrange NEWS
2016-01-21 02:24:51 +01:00
Ferenc Kovacs
b2d5666d94
prepare 5.6.18RC1
2016-01-21 02:24:05 +01:00
Ferenc Kovacs
f636f4c9a3
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
5.6.19 will be next
2016-01-20 15:43:15 +01:00
Ferenc Kovacs
a4fc2e1eb2
5.6.19 will be next
2016-01-20 15:39:05 +01:00
Remi Collet
e58cf4f996
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
2016-01-20 13:10:56 +01:00
Remi Collet
3c8f287d58
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message)
...
Fix skip message to work
2016-01-20 13:08:58 +01:00
Joe Watkins
98164714ea
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
2016-01-20 10:52:57 +00:00
Joe Watkins
b899656eb0
fix ReflectionClass::__toString doc block omitted
2016-01-20 10:52:27 +00:00
Anatol Belski
4b97237374
improve fix for bug #71201
2016-01-20 09:46:09 +01:00
Anatol Belski
a63904b150
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
improve fix for bug #71201
2016-01-20 09:45:49 +01:00
Anatol Belski
508d1dae25
improve fix for bug #71201
2016-01-20 09:44:28 +01:00
Anatol Belski
a6801092ab
improve fix for bug #71201
2016-01-20 00:49:05 +01:00
Anatol Belski
c6a30d5c8a
add 7.0.4 block to NEWS
2016-01-19 08:03:44 +01:00
Anatol Belski
b5cd7c30f8
bump version to 7.0.4-dev
2016-01-19 08:02:39 +01:00
Anatol Belski
f7e6ff99d7
set versions to 7.0.3RC1
2016-01-18 23:03:59 +01:00
Anatol Belski
2749bf4576
fix test for 7.0, OpenSSL >= 1.0.2 disables SSLv2 by default
2016-01-18 18:23:07 +01:00
Anatol Belski
71dbad172f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fork test
fix test
fork test
fork test for win32
fork test
2016-01-18 17:02:23 +01:00
Anatol Belski
fa0dd6006d
fork test
2016-01-18 16:59:17 +01:00
Anatol Belski
5673ede6e9
fix test
2016-01-18 16:52:48 +01:00
Anatol Belski
adf0be7680
fork test
2016-01-18 16:45:35 +01:00
Anatol Belski
f0e2fe8e75
fork test for win32
2016-01-18 16:37:04 +01:00
Anatol Belski
f0b02f2351
fork test
2016-01-18 16:34:20 +01:00
Stanislav Malyshev
52e0c4081f
Fix bug #71313 - Use-after-free vulnerability in SPL(SplObjectStorage, unserialize)
2016-01-17 23:23:42 -08:00
Yasuo Ohgaki
d7fc3be99e
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Use SUCCESS/FAILURE
2016-01-18 13:35:01 +09:00
Yasuo Ohgaki
ee1dd4949a
Use SUCCESS/FAILURE
2016-01-18 13:33:47 +09:00
Yasuo Ohgaki
f9c595f3c0
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
2016-01-18 10:54:07 +09:00
Stanislav Malyshev
bcd64a9bdd
Fixed bug #71311 : Use-after-free vulnerability in SPL(ArrayObject, unserialize)
2016-01-17 17:53:03 -08:00
Yasuo Ohgaki
7554478a4c
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
2016-01-18 10:52:11 +09:00
Yasuo Ohgaki
dc23f1f38f
Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
2016-01-18 10:51:29 +09:00
Yasuo Ohgaki
069522d494
Update NEWS
2016-01-18 09:47:34 +09:00
Yasuo Ohgaki
3b55386e9b
Merge branch 'pull-request/1731' into PHP-7.0
...
* pull-request/1731:
Fixed bug 71397 (mb_send_mail segmentation fault)
2016-01-18 09:39:38 +09:00
Yasuo Ohgaki
ff10dceff8
Fixed bug #71397 (mb_send_mail segmentation fault)
2016-01-18 09:23:20 +09:00
Tim Düsterhus
e585696a0b
Fixed bug 71397 (mb_send_mail segmentation fault)
2016-01-17 15:30:09 +01:00
Yasuo Ohgaki
8052df8110
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:php-src:
Remove unnecessary warning by warning reorder.
2016-01-17 17:14:15 +09:00
Yasuo Ohgaki
3b2d98a625
Fixed bug #71394 (session_regenerate_id() must close opened session on errors)
2016-01-17 17:11:47 +09:00
Yasuo Ohgaki
00eaaca18a
Remove unnecessary warning by warning reorder.
2016-01-17 17:08:44 +09:00
Yasuo Ohgaki
dbba4418d8
Remove unnecessary warning by warning reorder.
2016-01-17 16:21:01 +09:00
Stanislav Malyshev
6297a117d7
Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
2016-01-16 22:10:54 -08:00
Stanislav Malyshev
1c1b8b6998
Fix bug #71391 : NULL Pointer Dereference in phar_tar_setupmetadata()
2016-01-16 20:43:43 -08:00
Yasuo Ohgaki
9f2240963f
Add test for Bug #70133 (Extended SessionHandler::read is ignoring $session_id when calling parent)
2016-01-16 05:29:19 +09:00
Anatol Belski
93db2dac48
PS(id) is zend_string *, use appropriate API
2016-01-15 15:47:09 +01:00
Yasuo Ohgaki
925aea7e1b
Update NEWS
2016-01-15 17:05:58 +09:00
Anatol Belski
348dd1a018
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix header file include
2016-01-15 08:43:56 +01:00
Jason Young
d1401f6059
Fix header file include
2016-01-15 08:43:00 +01:00
Yasuo Ohgaki
34ff7bbeb1
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #69111 (Crash in SessionHandler::read()). Made session save handler abuse much harder than before.
2016-01-15 16:24:22 +09:00
Stanislav Malyshev
4c2424eb24
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
2016-01-14 22:58:40 -08:00
Yasuo Ohgaki
bfb9307b2d
Fixed bug #69111 (Crash in SessionHandler::read()).
...
Made session save handler abuse much harder than before.
2016-01-15 15:50:14 +09:00
Yasuo Ohgaki
d7f8d9e3a9
Fix typo
2016-01-15 15:21:18 +09:00
Yasuo Ohgaki
31ae802736
Fix uninitialized read in rfc1867 handler reported by valgrind. Only in PHP 5.6.
...
This commit fixes initialized read, but calling php_session_initialize() directly
is problematic because configuration could be invalid. Invalid config may result
in segfault. This will be addressed later.
2016-01-15 15:18:00 +09:00
Yasuo Ohgaki
132d919c85
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Improved fix for bug #68063 (Empty session IDs do still start sessions).
2016-01-15 10:19:01 +09:00
Yasuo Ohgaki
8c37a086c7
Improved fix for bug #68063 (Empty session IDs do still start sessions).
2016-01-15 09:45:08 +09:00
Anatol Belski
4ab7d6a5e1
update NEWS
2016-01-14 18:42:13 +01:00
Anatol Belski
33cc42d8a5
port 4308c868f9 to 7.0
2016-01-14 18:38:30 +01:00
Anatol Belski
b05eb52c35
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
Fixed bug #70979 crash with bad soap request
Update NEWS
2016-01-14 17:48:33 +01:00
Anatol Belski
c126725a7f
update NEWS
2016-01-14 17:47:17 +01:00
Anatol Belski
4308c868f9
Fixed bug #70979 crash with bad soap request
...
The error handler is overloaded with the SOAP one. However the SOAP
handler eventually wants to access some of its globals. This won't
work as long as the SOAP globals aren't initialized. The use case
is when an error is thrown before RINIT went through. As the call
order is arbitrary, the safest is to wait when all the modules
called their RINIT.
2016-01-14 17:42:28 +01:00
Anatol Belski
12eff055da
update NEWS
2016-01-14 09:02:54 +01:00
Xinchen Hui
ad85cce1bc
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Avoid incomplete zend_internal_function initialization.
2016-01-14 14:49:57 +08:00
Xinchen Hui
262f09d678
Fixed macro name
2016-01-14 14:49:23 +08:00
Stanislav Malyshev
285cd3417f
Fix bug #71335 : Type Confusion in WDDX Packet Deserialization
2016-01-13 16:43:04 -08:00
Stanislav Malyshev
635ba1f2c3
Merge branch 'bug71354' into PHP-5.5.32
...
* bug71354:
Fix bug #71354 - remove UMR when size is 0
2016-01-13 16:33:37 -08:00
Stanislav Malyshev
13ad4d3e97
Fix bug #71354 - remove UMR when size is 0
2016-01-13 16:32:29 -08:00
Dmitry Stogov
6a2621e3a5
Avoid incomplete zend_internal_function initialization.
2016-01-13 15:06:17 +03:00
Xinchen Hui
39f0950746
Fixed bug #71336 (Wrong is_ref on properties as exposed via get_object_vars())
2016-01-13 17:38:18 +08:00
Dmitry Stogov
50be2c89be
Fixed bug #71248 (Wrong interface is enforced)
2016-01-13 11:41:57 +03:00
Yasuo Ohgaki
c3c6ab08fe
Update NEWS
2016-01-13 06:40:28 +09:00
Yasuo Ohgaki
1f513805dc
Update NEWS
2016-01-13 06:40:11 +09:00
Bogdan Padalko
2b4625d687
Remove obj handlers ptr value from spl_object_hash()
...
We still keep the same output length, for people who rely on the
return value having a specific format. The handler part will now
simply be always the same (it was the same nearly always anyway).
The motivation behind this change is to avoid breaking
spl_object_hash() and SplObjectStorage if an extension changes the
handlers table of an object. This has come up, for example, in
weakref implementations.
2016-01-12 16:47:21 +01:00
Julien Pauli
bec0aec116
Trigger op_array_handler() if HAVE_OP_ARRAY_HANDLER is set
2016-01-12 15:19:14 +01:00
Anatol Belski
c527549e89
Fixed bug #71039 exec functions ignore length but look for NULL termination
2016-01-12 14:57:22 +01:00
Anatol Belski
22a5ccab72
Follow up on bug #71270
...
Using the max allowed command line length for an underlying OS.
2016-01-12 14:41:44 +01:00
Remi Collet
aa8d3a8cc6
fix the fix for bug #70976 (imagerotate)
2016-01-12 14:03:35 +01:00
Remi Collet
af3f3be0c1
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix the fix for bug #70976 (imagerotate)
Use php_session_abort()
2016-01-12 13:54:23 +01:00
Remi Collet
14e4d393cf
fix the fix for bug #70976 (imagerotate)
2016-01-12 13:52:27 +01:00
Yasuo Ohgaki
63c77ee4b1
Use php_session_abort()
2016-01-12 20:39:33 +09:00
Yasuo Ohgaki
224aaf94af
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed Bug #71038 session_start() returns TRUE on failure
2016-01-12 19:52:54 +09:00
Yasuo Ohgaki
a15e9ccba8
Fixed Bug #71038 session_start() returns TRUE on failure
2016-01-12 19:09:49 +09:00
Anatol Belski
4e7cb057a0
partial test fixes, only obvious mistaking parts
2016-01-12 10:44:55 +01:00
Anatol Belski
d8e2b8424f
remove the unnecessary condition part
2016-01-12 10:22:10 +01:00
Anatol Belski
8e7c469f82
fix possible buffer overrun in the errmsg string
2016-01-12 10:17:32 +01:00
Anatol Belski
b54739e68d
integrate tsrmls cache
2016-01-12 09:42:38 +01:00
Anatol Belski
391b73b484
update NEWS for fixed bug #71132 , fixed bug #71197
2016-01-12 08:34:35 +01:00
Thomas Punt
3bbcd84e2f
re-apply patch for github PR #1695
2016-01-12 07:07:51 +01:00
Anatol Belski
f53a5dcca3
Revert "update NEWS"
...
This reverts commit 7954e5dc2a .
2016-01-11 22:03:39 +01:00
Anatol Belski
66d10fe085
Revert "patch for github PR #1695 "
...
This reverts commit 58dd956b63 .
crashes on travis
2016-01-11 22:03:36 +01:00
Anatol Belski
3bbbd3ebcd
update NEWS
2016-01-11 21:44:23 +01:00
Anatol Belski
e509144714
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-01-11 21:43:52 +01:00
Anatol Belski
ba7736729e
update NEWS
2016-01-11 21:42:31 +01:00
Anatol Belski
ce568f98bf
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Simplify code per Anatol.
Insert bug number.
Use strtoll() when apr_off_t is 64 bits.
2016-01-11 21:39:31 +01:00
Adam Harvey
f301a0b23c
Simplify code per Anatol.
2016-01-11 21:36:55 +01:00
Adam Harvey
3217c033a5
Insert bug number.
2016-01-11 21:36:53 +01:00
Adam Harvey
c895dc5b5b
Use strtoll() when apr_off_t is 64 bits.
2016-01-11 21:36:51 +01:00
Anatol Belski
7954e5dc2a
update NEWS
2016-01-11 21:14:16 +01:00
Thomas Punt
58dd956b63
patch for github PR #1695
2016-01-11 21:11:55 +01:00
Anatol Belski
1f6612541f
fix out format
2016-01-11 20:57:34 +01:00
Anatol Belski
763f86b5d4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2016-01-11 20:42:20 +01:00
Anatol Belski
6d649b018c
update NEWS
2016-01-11 20:41:29 +01:00
Anatol Belski
333765edce
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
backport 9a07245b72 from 7.0
2016-01-11 20:39:52 +01:00
Anatol Belski
fffbca55e8
backport 9a07245b72 from 7.0
2016-01-11 20:37:46 +01:00
Anatol Belski
b188cafab3
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Align NEWS entry format
2016-01-11 12:16:41 +01:00
Anatol Belski
39e571c8d8
further datatype and range check fixes for ibase
2016-01-11 09:46:53 +01:00
Anatol Belski
57a2a8d4fa
datatype fixes
2016-01-11 08:52:54 +01:00
Anatol Belski
23fa54b908
fix typo for #ifdef
2016-01-11 08:37:16 +01:00
Xinchen Hui
8bfa5193d5
Fix various bugs in interbase
...
Also read: https://marc.info/?l=php-internals&m=145077389117375&w=2
2016-01-11 08:32:47 +01:00
Lior Kaplan
35e87c04fe
Align NEWS entry format
2016-01-09 19:10:01 +02:00
Andrea Faulds
ae50a0c0be
Fix bug #71314
2016-01-08 17:20:52 +00:00
Anatol Belski
c7256095c5
update libs_versions.txt
2016-01-08 08:36:21 +01:00
Anatol Belski
a98f6dad00
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update libs versions
2016-01-08 08:35:17 +01:00
Anatol Belski
07133ae649
update libs versions
2016-01-08 08:33:55 +01:00
Anatol Belski
caae1191da
allow static build of ext/ftp
2016-01-08 08:07:15 +01:00
Anatol Belski
0e808b2332
update NEWS
2016-01-07 18:56:53 +01:00
Anatol Belski
1fb763ccab
Fixed bug #71227 Can't compile php_curl statically
2016-01-07 18:55:05 +01:00
Anatol Belski
e72848c171
more informative error message for opcache fallback
2016-01-07 17:57:41 +01:00
Anatol Belski
42a145273c
add SKIPIF condition
2016-01-07 17:54:26 +01:00
Xinchen Hui
16a2b47394
Fixed bug #71300 (Segfault in zend_fetch_string_offset)
2016-01-07 07:05:17 -08:00
Bob Weinand
83cb751047
Fix accidental zval_dtor() usage
2016-01-07 15:12:50 +01:00
Julien Pauli
da0eeacf1d
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
5.5.32 now
2016-01-07 13:55:42 +01:00
Julien Pauli
bd2229e709
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.32 now
Conflicts:
configure.in
main/php_version.h
2016-01-07 13:55:09 +01:00
Julien Pauli
a6734f70e1
5.5.32 now
2016-01-07 13:07:23 +01:00
Julien Pauli
a95f36fa7b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
5.5.32 now
2016-01-07 13:05:57 +01:00
Julien Pauli
2d0215b063
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.32 now
Conflicts:
configure.in
main/php_version.h
2016-01-07 13:05:38 +01:00
Julien Pauli
96c205b5f6
5.5.32 now
2016-01-07 13:04:35 +01:00
Bob Weinand
033d608771
Fixed bug #71297 (Memory leak with yield from)
2016-01-07 11:56:21 +01:00
Ferenc Kovacs
42e0fff928
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
adjust release date for the delay
2016-01-06 15:55:17 +01:00
Ferenc Kovacs
b095a22a3b
adjust release date for the delay
2016-01-06 15:54:55 +01:00
Ferenc Kovacs
a9a7926df5
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
these will be part of 5.6.17 not 5.6.18
Removed unecessary string dup
Moved buffer from heap to stack
2016-01-06 15:49:06 +01:00
Ferenc Kovacs
6802a9f28a
these will be part of 5.6.17 not 5.6.18
2016-01-06 15:23:18 +01:00
Julien Pauli
ef4dc15831
Moved buffer from heap to stack
2016-01-06 11:41:16 +01:00
Julien Pauli
86f48881a4
Removed unecessary string dup
2016-01-06 10:51:36 +01:00
Julien Pauli
810452f68e
Moved buffer from heap to stack
2016-01-06 10:51:36 +01:00
Anatol Belski
1e1c5c427e
updated NEWS
2016-01-06 07:53:31 +01:00
libnex
2871c70efa
Patch for Heap Buffer Overflow in EscapeShell
...
Proposed patch for bug #71270
2016-01-06 07:49:21 +01:00
Anatol Belski
e2565eb614
set release date
2016-01-06 07:45:03 +01:00
Anatol Belski
158288b3c6
fix NEWS and add some 7.0.2 entries
2016-01-06 07:44:26 +01:00
Anatol Belski
c0928be7f8
Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0
...
* phpsec/PHP-7.0:
add NEWS entries for 7.0.2
re-apply the patch from 1785d2b805
Improve fix for bug #70976
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
fix merge mistake
Fixed #70728
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
2016-01-06 06:09:12 +01:00
Anatol Belski
d91b26d344
Merge remote-tracking branch 'origin/PHP-5.6' into PHP-7.0
...
* origin/PHP-5.6:
Update NEWS
Improve fix for bug #70976
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Fixed bug #70741 : Session WDDX Packet Deserialization Type Confusion Vulnerability
Fixed #70728
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
typofix
2016-01-06 06:08:46 +01:00
Stanislav Malyshev
13750cb0a1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Improve fix for bug #70976
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Fixed bug #70741 : Session WDDX Packet Deserialization Type Confusion Vulnerability
Fixed #70728
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
typofix
2016-01-05 19:38:29 -08:00
Stanislav Malyshev
74dcbe1299
Update NEWS
2016-01-05 19:28:24 -08:00
Xinchen Hui
ce2b2f7e0a
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2016-01-06 00:02:53 +08:00
George Wang
69112d7e97
Fixed runtime php.ini override, ini name length is off by 1.
...
(cherry picked from commit 5bcb7a7019 )
2016-01-05 23:48:42 +02:00
Anatol Belski
1dc395c8c4
improve fix for bug #71273
2016-01-05 20:03:05 +01:00
Anatol Belski
8d630f7d15
update NEWS
2016-01-05 18:57:38 +01:00
Anatol Belski
9a07245b72
Fixed bug #71273 A wrong ext directory setup in php.ini leads to crash
2016-01-05 18:54:46 +01:00
Xinchen Hui
695e8b79af
Fixed bug #71287 (Error message contains hexadecimal instead of decimal number)
2016-01-06 00:01:44 +08:00
Bob Weinand
654c8aedd1
Fixed bug #71275 (Bad method called on cloning an object having a trait)
2016-01-05 16:27:24 +01:00
Xinchen Hui
d4da32d312
Fixed bug #71280 (ibase_blob_add() expects parameter 2 to be resorce)
2016-01-05 23:02:17 +08:00
Anatol Belski
af960fcba4
add NEWS entries for 7.0.2
2016-01-05 13:06:00 +01:00
Julien Pauli
736b91c650
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c
2016-01-04 18:13:38 +01:00
Jakub Zelenka
0ea63cb2a8
Fix small CS label issue in openssl.c
2016-01-04 16:52:52 +00:00
Anatol Belski
cf1c50957b
re-apply the patch from 1785d2b805
...
too many conflicts to cherry-pick
2016-01-04 17:52:37 +01:00
Dominic Luechinger
e4bdf51f0a
Replaced whitespaces with tabs and fixed aligments
2016-01-04 16:46:32 +00:00
Stanislav Malyshev
82865dda71
Improve fix for bug #70976
2016-01-04 17:37:54 +01:00
Stanislav Malyshev
84b8db597a
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
2016-01-04 17:37:40 +01:00
Stanislav Malyshev
2eaa755660
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
2016-01-04 17:36:42 +01:00
Anatol Belski
b0285db4b7
fix merge mistake
2016-01-04 17:33:23 +01:00
Julien Pauli
ef4449a8e8
Fixed #70728
...
Conflicts:
ext/xmlrpc/xmlrpc-epi-php.c
2016-01-04 17:31:34 +01:00
Stanislav Malyshev
bc4baf608b
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
...
Conflicts:
ext/wddx/wddx.c
2016-01-04 17:10:29 +01:00
Anatol Belski
a09e65d2b8
Merge remote-tracking branch 'php/PHP-7.0' into PHP-7.0
...
* php/PHP-7.0: (115 commits)
Do not edit the value in place (might be relates to #71261 )
Fixed bug #71264 (file_put_contents() returns unexpected value when filesystem runs full)
Duplicated i
remove duplicated skipif conditions
bump year which is missed in rev 49493a2
bump year which is missed in rev 49493a2
sync with new tests from 7.0 for ICU 55_1 and 56_1 compat
sync skipifs for ext/intl for ICU 55_* and 56_* compat
Update header to PHP Version 7
Happy new year (Update copyright to 2016)
Happy new year (Update copyright to 2016)
Happy new year (Update copyright to 2016)
Fixed bug #71249 (ldap_mod_replace/ldap_mod_add store value as string "Array")
Fixed test after fix lineno of finally
MFH: Fix lineno for finally FAST_CALL and JMP
This should be better
Fixed bug #71245 (file_get_contents() ignores "header" context option if it's a reference)
Fixed info while setting opcache.file_cache_only
Drop extra line
Add CVE for #71105 (PHP 7.0.1)
...
2016-01-04 17:07:37 +01:00
Xinchen Hui
36b4311edd
Do not edit the value in place (might be relates to #71261 )
2016-01-04 05:38:15 -08:00
Xinchen Hui
919562d53b
Fixed bug #71264 (file_put_contents() returns unexpected value when filesystem runs full)
2016-01-03 14:21:23 +08:00
Xinchen Hui
bce7ed1859
Duplicated i
2016-01-03 14:06:52 +08:00
Lior Kaplan
53fb2f1e5c
Happy new year (Update copyright to 2016)
2016-01-03 01:44:37 +02:00
Anatol Belski
302a35bb15
remove duplicated skipif conditions
2016-01-02 13:56:56 +01:00
Xinchen Hui
97a9470d97
bump year which is missed in rev 49493a2
2016-01-02 17:56:11 +08:00
Xinchen Hui
6a7001ed72
Merge branch 'PHP-5.6' into PHP-7.0
2016-01-02 17:53:01 +08:00
Xinchen Hui
3537e95dae
bump year which is missed in rev 49493a2
2016-01-02 17:51:24 +08:00
Xinchen Hui
d9bac84220
Merge branch 'PHP-5.6' of https://github.com/kaplanlior/php-src into PHP-5.6
2016-01-02 17:48:20 +08:00
Anatol Belski
2c6a4445f7
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
sync with new tests from 7.0 for ICU 55_1 and 56_1 compat
sync skipifs for ext/intl for ICU 55_* and 56_* compat
2016-01-01 20:27:23 +01:00
Anatol Belski
a7b1ea3c84
sync with new tests from 7.0 for ICU 55_1 and 56_1 compat
2016-01-01 20:25:36 +01:00
Anatol Belski
6bcf4b4f40
sync skipifs for ext/intl for ICU 55_* and 56_* compat
2016-01-01 20:13:35 +01:00
Lior Kaplan
59a7ef914f
Update header to PHP Version 7
2016-01-01 20:03:16 +02:00
Lior Kaplan
2eb1f38d24
Happy new year (Update copyright to 2016)
2016-01-01 20:03:16 +02:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
c51e73c803
Happy new year (Update copyright to 2016)
2016-01-01 19:23:04 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
87958927b0
Fixed bug #71249 (ldap_mod_replace/ldap_mod_add store value as string "Array")
2016-01-01 07:06:58 -08:00
Xinchen Hui
05defb4f56
Fixed test after fix lineno of finally
2016-01-01 13:46:19 +08:00
Derick Rethans
5362f0ad7f
MFH: Fix lineno for finally FAST_CALL and JMP
2015-12-31 09:46:43 +00:00
Xinchen Hui
da028e0757
This should be better
2015-12-30 05:10:05 -08:00
Xinchen Hui
90d2f509e2
Fixed bug #71245 (file_get_contents() ignores "header" context option if it's a reference)
2015-12-30 05:04:21 -08:00
Xinchen Hui
3f07a256f7
Fixed info while setting opcache.file_cache_only
2015-12-29 15:49:10 +08:00
Stanislav Malyshev
2baeb167a0
Improve fix for bug #70976
2015-12-28 23:44:14 -08:00
Stanislav Malyshev
dcf3c9761c
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
2015-12-28 14:46:35 -08:00
Stanislav Malyshev
1785d2b805
Fixed bug #70741 : Session WDDX Packet Deserialization Type Confusion Vulnerability
2015-12-28 12:44:10 -08:00
Lior Kaplan
c5f9d0b808
Drop extra line
2015-12-27 20:18:23 +02:00
Lior Kaplan
2c289f48e1
Add CVE for #71105 (PHP 7.0.1)
2015-12-27 20:17:19 +02:00
Xinchen Hui
2453a48ab5
Fixed bug #71225 (curl_setopt() fails to set CURLOPT_POSTFIELDS with reference to CURLFile)
2015-12-26 22:55:38 -08:00
Andrea Faulds
60f5c9f87f
Hatch elePHPant
2015-12-27 01:03:03 +00:00
Xinchen Hui
decb934e3a
Fixed test (extract is no affected)
2015-12-25 21:31:42 -08:00
Xinchen Hui
c56efb848b
Fixed bug #71220 (Null pointer deref (segfault) in compact via ob_start)
2015-12-25 21:25:53 -08:00
Xinchen Hui
6700be67f5
Fixed bug #71221 (Null pointer deref (segfault) in get_defined_vars via ob_start)
2015-12-25 20:32:26 -08:00
Levi Morrison
2a7eeff33e
Remove mentions of "type hint" and "typehint"
2015-12-24 15:19:31 +01:00
Julien Pauli
8182f0ff2a
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test
2015-12-24 14:44:33 +01:00
Julien Pauli
0bdc2923b1
Fixed test
2015-12-24 14:44:07 +01:00
Julien Pauli
048fb4b00f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed and improved tests
test to function socket_getopt();
test to function socket_clear_error();;
test to function socket_shutdown();
test to function socket_send();
test to function gethostname ( void );
test to function DateTimeZone::getLocation();
test to function stream_get_transports();
test to function stream_get_wrappers();
test to function stream_socket_enable_crypto();
test to function stream_socket_get_name();
Create stream_socket_recvfrom.phpt
test to stream function set_file_buffer.phpt();
test to function PDO_getAvaliableDrivers;
test to misc. function connection_status();
test to function connection_aborted();
test to function memory_get_peak_usage();
2015-12-24 14:08:59 +01:00
Julien Pauli
d73d9fecf6
Fixed and improved tests
2015-12-24 14:08:44 +01:00
marcosptf
7f31a88bb8
test to function socket_getopt();
2015-12-24 13:23:00 +01:00
marcosptf
599a0cfdeb
test to function socket_clear_error();;
2015-12-24 13:17:35 +01:00
marcosptf
e9d3ff0ec7
test to function socket_shutdown();
2015-12-24 13:04:38 +01:00
marcosptf
1c0d01522c
test to function socket_send();
2015-12-24 11:48:09 +01:00
marcosptf
bdc8f7d871
test to function gethostname ( void );
2015-12-24 11:46:48 +01:00
marcosptf
891ac59305
test to function DateTimeZone::getLocation();
2015-12-24 10:56:23 +01:00
marcosptf
ca0b82fe93
test to function stream_get_transports();
2015-12-24 10:53:53 +01:00
marcosptf
e9d1dff514
test to function stream_get_wrappers();
2015-12-24 10:51:51 +01:00
marcosptf
7e399566a7
test to function stream_socket_enable_crypto();
2015-12-24 10:50:54 +01:00
marcosptf
a7daf97198
test to function stream_socket_get_name();
2015-12-24 10:49:02 +01:00
marcosptf
3295264336
Create stream_socket_recvfrom.phpt
2015-12-24 10:47:35 +01:00
marcosptf
379b43bb3b
test to stream function set_file_buffer.phpt();
2015-12-24 10:47:02 +01:00
marcosptf
4f528e5c95
test to function PDO_getAvaliableDrivers;
...
was add new function to PDO::getAvailableDrivers
2015-12-24 10:45:39 +01:00
marcosptf
8d1d5ffa22
test to misc. function connection_status();
2015-12-24 10:45:10 +01:00
marcosptf
841594ac18
test to function connection_aborted();
...
was added a new uncovered misc. function
2015-12-24 10:43:34 +01:00
marcosptf
a82f76634a
test to function memory_get_peak_usage();
...
add new test to uncoverage function;
please, @laurence, see if this path is correct!
Thanks
2015-12-24 10:42:22 +01:00
Julien Pauli
3f09d301b5
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Update default_mimetype ini setting description
2015-12-24 10:33:41 +01:00
Thomas Punt
9306c1d254
Update default_mimetype ini setting description
...
This is in response to doc bug #70287
2015-12-24 10:33:15 +01:00
Tom Van Looy
aadb3dd503
These function docs are referencing zend_object_value but this should be zend_object
2015-12-24 10:24:53 +01:00
Xinchen Hui
c2fa01b939
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
update NEWS
update NEWS
fix merge mistake
Added test for bug #71201
Bug #71201 round() segfault on 64-bit builds
Sort 7.0.1 extensions' entries
Added test for bug #71201
Bug #71201 round() segfault on 64-bit builds
Add CVE for #71020 (PHP 7.0.1)
Update NEWS & Fixed test
Fixed bug #71204 (segfault if clean spl_autoload_funcs while autoloading)
This should never fail
Fixed bug #71202 (Autoload function registered by another not activated immediately)
Updated NEWS
Added support for HTTP 451
2015-12-24 10:42:42 +08:00
Xinchen Hui
64071fc531
Superfluous semicolon
2015-12-24 10:41:05 +08:00
Anatol Belski
85809b969f
update NEWS
2015-12-23 18:39:40 +01:00
Anatol Belski
46db3a7320
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
Added test for bug #71201
Bug #71201 round() segfault on 64-bit builds
Conflicts:
ext/standard/math.c
2015-12-23 18:38:54 +01:00
Anatol Belski
0b8c8bfc81
update NEWS
2015-12-23 18:37:05 +01:00
Anatol Belski
0ece97e5a4
fix merge mistake
2015-12-23 18:30:32 +01:00
Anatol Belski
204faa5c36
Added test for bug #71201
2015-12-23 18:26:56 +01:00
Anatol Belski
95454c448b
Bug #71201 round() segfault on 64-bit builds
2015-12-23 18:26:55 +01:00
Lior Kaplan
dbda61b19b
Sort 7.0.1 extensions' entries
2015-12-23 19:25:02 +02:00
Anatol Belski
50c4be0309
Added test for bug #71201
2015-12-23 18:18:02 +01:00
Anatol Belski
0d822f6df9
Bug #71201 round() segfault on 64-bit builds
2015-12-23 18:16:52 +01:00
Lior Kaplan
5c11f4c489
Add CVE for #71020 (PHP 7.0.1)
2015-12-23 19:16:39 +02:00
Xinchen Hui
825b7f895a
Update NEWS & Fixed test
2015-12-23 08:13:13 -08:00
Xinchen Hui
8692a99551
Merge branch 'PHP-5.6' into PHP-7.0
2015-12-23 08:11:09 -08:00
Xinchen Hui
620ccc9b1a
Fixed bug #71204 (segfault if clean spl_autoload_funcs while autoloading)
2015-12-23 08:10:59 -08:00
Xinchen Hui
9cc4cdbe57
This should never fail
2015-12-23 07:52:24 -08:00
Xinchen Hui
e21cb2daea
Fixed bug #71202 (Autoload function registered by another not activated immediately)
2015-12-23 07:48:00 -08:00
Julien Pauli
72207b5436
Updated NEWS
2015-12-23 11:37:59 +01:00
Julien Pauli
b2ecac9250
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Added support for HTTP 451
Conflicts:
sapi/cgi/cgi_main.c
sapi/cli/php_cli_server.c
sapi/fpm/fpm/fpm_main.c
2015-12-23 11:36:36 +01:00
Julien Pauli
ea12ff149c
Added support for HTTP 451
2015-12-23 11:31:18 +01:00
Dmitry Stogov
f3bf95eb81
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed incorrect setting on 32-bit systems
2015-12-22 21:32:45 +03:00
Dmitry Stogov
a57a08e791
Fixed incorrect setting on 32-bit systems
2015-12-22 21:31:28 +03:00
Bob Weinand
3e3d0290ff
Added test for (long-ago fixed) bug #70083
2015-12-22 17:39:36 +01:00
Julien Pauli
4df84a648e
Fixed #70728
2015-12-22 17:12:49 +01:00
Julien Pauli
897bf916bc
Updated NEWS
2015-12-22 16:27:52 +01:00
Julien Pauli
332b778d68
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix #70720
Align NEWS entry format
2015-12-22 16:26:30 +01:00
Julien Pauli
ff7ed9021c
Fix #70720
2015-12-22 16:25:51 +01:00
Anatol Belski
4037ba5847
release only appropriate string
2015-12-22 14:33:19 +01:00
Anatol Belski
a3e37e0818
update NEWS
2015-12-22 13:18:21 +01:00
Anatol Belski
84530360a0
7.0.3 next
2015-12-22 10:48:32 +01:00
Xinchen Hui
d63ae2c382
Fixed bug #71190 (substr_replace converts integers in original $search array to strings)
2015-12-22 12:13:28 +08:00
Xinchen Hui
3524849f77
Fixed #71188 (str_replace converts integers in original $search array to strings)
2015-12-22 11:07:30 +08:00
Lior Kaplan
db1504de23
Align NEWS entry format
2015-12-21 23:14:23 +02:00
Dmitry Stogov
0402f05ba3
Fixed possible crash on Zend/tests/bug71154.phpt
2015-12-21 15:57:53 +03:00
Anatol Belski
53bfb6618d
Revert "Partially fix bug #71129 "
...
This reverts commit 4c55669caa .
The way it is fixes doesn't satisfy every SAPI, so a better solution
is yet to work out.
2015-12-21 12:09:24 +01:00
Xinchen Hui
4531d2c591
Fixed typo
2015-12-21 18:12:57 +08:00
Xinchen Hui
817513af4e
Fixed bug #71178 (preg_replace with arrays creates [0] in replace array if not already set)
2015-12-21 18:10:48 +08:00
Lior Kaplan
c85f569e52
Align #71165 entry format
2015-12-20 23:48:25 +02:00
Anatol Belski
4c55669caa
Partially fix bug #71129
2015-12-20 15:25:11 +01:00
Xinchen Hui
cfe977a406
Typo
2015-12-19 05:44:29 -08:00
Lior Kaplan
05345f5ad4
Bug #71105 was fixed in 7.0.1 (commit 9374ba35)
2015-12-19 13:21:16 +02:00
Xinchen Hui
baf7ad1555
Fixed NEWS
2015-12-18 21:54:57 -08:00
Xinchen Hui
a21b0942fa
Fixed bug #71165 (-DGC_BENCH=1 doesn't work on PHP7)
2015-12-18 21:52:05 -08:00
Xinchen Hui
1d79011fb9
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-12-18 21:40:48 -08:00
Xinchen Hui
eb4ce3f1a8
Fixed bug #71163 (Segmentation Fault: cleanup_unfinished_calls)
2015-12-18 21:40:20 -08:00
Andrea Faulds
42c8f5e91d
Fix bug #70804
...
This follows on from a4648ded43 and
4e01269082 .
Both -(+0.0) and +(-0.0) behaved incorrectly for the same reason.
2015-12-19 02:25:44 +00:00
Andrea Faulds
8d217db369
Fix bug #66179
...
This also fixes ext/standard/tests/general_functions/var_export-locale.phpt
to actually run the floating-point section.
2015-12-18 19:31:21 +00:00
Xinchen Hui
8f9af36da3
Fixed bug #71144 (Sementation fault when using cURL with ZTS)
2015-12-19 00:29:19 +08:00
Xinchen Hui
916f10ac31
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-12-19 00:20:18 +08:00
Xinchen Hui
512498d083
Fixed test skip
2015-12-19 00:19:21 +08:00
Xinchen Hui
b715845650
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
2015-12-18 17:44:05 +08:00
Xinchen Hui
361b5814de
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:/php-src:
Align news entry format: Implement FR -> Implemented FR
2015-12-18 17:43:25 +08:00
Xinchen Hui
2f47e9872e
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Improved fix for #71127
Conflicts:
ext/opcache/Optimizer/pass1_5.c
2015-12-18 17:41:42 +08:00
Xinchen Hui
40702799b5
Improved fix for #71127
2015-12-18 17:37:40 +08:00
Andrea Faulds
4e01269082
Fix tests broken by 'Fix bug #52355 '
...
a4648ded43 broke some tests
2015-12-17 23:33:24 +00:00
Andrea Faulds
a4648ded43
Fix bug #52355
2015-12-17 22:39:29 +00:00
Nikita Popov
a917840f38
Fixed iter leak on by-ref foreach over const/tmp array
...
FE_FREE does not unregister the iter for plain arrays. So always
wrap into a REF wrapper, even if not strictly necessary, in
RESET_RW. Alternatively we could use a flag to distinguish plain
positions and interators.
Also added a check for leaked iterators in shutdown_executor.
2015-12-17 23:21:48 +01:00
Nikita Popov
6a4c02e107
Fixed bug #71154
2015-12-17 22:20:29 +01:00
George Wang
0a1a4dc033
Fixed a bug in apache_request_headers() that adds an extra \0 to header name.
2015-12-17 15:20:08 -05:00
Nikita Popov
a3e1952700
Fixed bug #71153
2015-12-17 20:59:57 +01:00
Dmitry Stogov
9e44b6a61e
Fixed incorrect exception handling
2015-12-17 14:16:19 +03:00
Lior Kaplan
860ef0e2d7
Align NEWS entry format
2015-12-17 11:39:09 +02:00
Lior Kaplan
38e16154dd
Align news entry format: Implement FR -> Implemented FR
2015-12-17 11:38:07 +02:00
Lior Kaplan
c537039fcb
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Align news entry format: Implement FR -> Implemented FR
2015-12-17 11:29:47 +02:00
Lior Kaplan
e61bb3fbf9
Align news entry format: Implement FR -> Implemented FR
2015-12-17 11:27:41 +02:00
Xinchen Hui
1b4e224c98
Update NEWs
2015-12-17 14:30:41 +08:00
Xinchen Hui
9374977d21
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/opcache/Optimizer/pass1_5.c
2015-12-17 14:30:00 +08:00
Xinchen Hui
940c68b55d
Fixed bug #71127 (Define in auto_prepend_file is overwrite)
2015-12-17 14:27:33 +08:00
Dmitry Stogov
c7c3b967a5
Removed invalid efree() (arguments are allocated on VM stack and used without copying)
2015-12-16 15:25:49 +03:00
Lior Kaplan
96fe1dfe53
Add entry for session.lazy_write
2015-12-16 11:37:43 +02:00
Lior Kaplan
ef9ddd0d82
Remove sqlite extension leftover references (was removed in PHP 5.4)
2015-12-16 09:40:02 +02:00
Yasuo Ohgaki
57be57ac94
Fix ZTS build
2015-12-16 11:10:39 +09:00
Yasuo Ohgaki
707e1c4710
Fixed test
2015-12-16 09:35:45 +09:00
Yasuo Ohgaki
714f28d8e4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #71122 Session GC may not remove obsolete session data
2015-12-16 09:34:41 +09:00
Yasuo Ohgaki
e8f1c29cc9
Fixed bug #71122 Session GC may not remove obsolete session data
2015-12-16 09:15:05 +09:00
Lior Kaplan
838e4039d7
Remove extra line
2015-12-15 11:15:30 +02:00
Lior Kaplan
66d1d10917
NEWS entry for #55651
2015-12-15 11:13:54 +02:00
Avi Brender
90a26a4844
Implement FR #55651 (Option to ignore the returned FTP PASV address)
2015-12-15 11:07:40 +02:00
Yasuo Ohgaki
071616026f
Update NEWS
2015-12-15 10:40:07 +09:00
Yasuo Ohgaki
8161230505
Fixed Bug #71122 Session GC may not remove obsolete session data
2015-12-15 10:27:28 +09:00
Xinchen Hui
3d3782c328
Unused vars
2015-12-14 09:23:01 -08:00
Lior Kaplan
94f3887152
NEWS entry for #55651
2015-12-15 11:52:33 +02:00
Avi Brender
71e468e141
Implement FR #55651 (Option to ignore the returned FTP PASV address)
2015-12-15 11:51:32 +02:00
Yasuo Ohgaki
e048b3fc6b
Update NEWS
2015-12-15 10:41:39 +09:00
Yasuo Ohgaki
1e042ae4a7
Fix merge conflict
2015-12-15 10:30:16 +09:00
Rasmus Lerdorf
56bf10f0bd
Support uwsgi sapi in opcache
2015-12-14 06:10:26 -08:00
Rasmus Lerdorf
9a31d70845
Support uwsgi sapi in opcache
2015-12-14 06:09:17 -08:00
Anthony Ferrara
02e85045dc
Refactor password_hash to use random_bytes internally to generate salts
2015-12-14 09:05:16 +01:00
Xinchen Hui
6a35e3b383
Added NEWS
2015-12-14 10:54:10 +08:00
Nikita Popov
7dc5bc5063
Do not swap operands in array addition
...
As we support constant array operands nowadays, the original check
didn't work anymore.
2015-12-14 00:29:05 +01:00
Xinchen Hui
07b33992a2
Fixed bug #71109 (ZEND_MOD_CONFLICTS("xdebug") doesn't work)
2015-12-13 05:06:08 -08:00
Xinchen Hui
4171a8f6c6
Internal function argumensts cleanup (strict_types)
2015-12-12 22:52:37 -08:00
Xinchen Hui
a9026070b6
Fixed test
2015-12-12 22:37:50 -08:00
Xinchen Hui
b101a6bbd4
Use format string
2015-12-12 18:45:11 -08:00
Christopher Jones
e0691d27d5
Merge branch 'PHP-5.6' into PHP-7.0
2015-12-13 08:22:14 +11:00
Christopher Jones
82d58e6cbc
Update README
2015-12-13 08:21:41 +11:00
Reeze Xia
95ad414658
Unused value casting should be void
2015-12-12 23:25:30 +08:00
Christopher Jones
e4a48ab6b3
Prepare for a PECL release
2015-12-12 16:07:57 +11:00
Christopher Jones
915a00cd8b
Merge branch 'PHP-5.6' into PHP-7.0
2015-12-12 16:06:44 +11:00
Christopher Jones
8f7e98ac4a
Prepare for a PECL release
2015-12-12 16:06:08 +11:00
Xinchen Hui
1358743f9c
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-12-11 09:13:00 -08:00
Xinchen Hui
778e5f3da5
Fixed bug #71092 (Segmentation fault with return type hinting)
2015-12-11 09:11:28 -08:00
Anatol Belski
050e21beed
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
backported 7c981192eb from 7.0
2015-12-11 17:43:36 +01:00
Anatol Belski
57eecd4e29
update NEWS
2015-12-11 17:42:01 +01:00
Anatol Belski
157d0372e0
backported 7c981192eb from 7.0
...
the way it doesn't hurt BC
2015-12-11 17:39:57 +01:00
Nikita Popov
04407b79df
Fixed bug #71094
...
I didn't see any non-dummy readline tests to work off, so this
change is tested manually only.
While at it also fix other zval_dtors and use ZVAL_COPY.
2015-12-11 16:33:07 +01:00
Nikita Popov
fd3ece8578
Fix bug #71086
2015-12-11 16:05:49 +01:00
Remi Collet
7a5c7e00cd
NEWS
2015-12-11 13:23:21 +01:00
Remi Collet
66398757fc
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
NEWS
Fix Bug #71089 No check to duplicate zend_extension
2015-12-11 13:22:55 +01:00
Remi Collet
d403a91c6f
NEWS
2015-12-11 13:22:13 +01:00
Remi Collet
410eacc1a9
Fix Bug #71089 No check to duplicate zend_extension
2015-12-11 13:21:24 +01:00
Xinchen Hui
b5adfee320
Fixed bug memleak in header_register_callback
2015-12-11 17:26:31 +08:00
Nikita Popov
5c5209d676
Fix cleanup in bug70748.phpt
...
git add Zend/tests usable again...
2015-12-10 19:14:49 +01:00
Nikita Popov
798d168d73
Make update_opN_const implementation symmetric
...
So the main structure is the same...
2015-12-10 18:18:10 +01:00
Nikita Popov
37f3425263
Fix Foo::${42} and similar
...
Fixes segfault on direct use, segfault on opcache evaluated use,
leak on temporary use.
Fixes analogeous segfault for ${42} on opcache eval as well.
2015-12-10 18:14:40 +01:00
Lior Kaplan
a19f511345
Align NEWS entry format for bug #71024
2015-12-10 15:31:06 +02:00
Xinchen Hui
c096a281be
The first arg is optional
2015-12-10 19:36:41 +08:00
Xinchen Hui
e4ad9ed8ad
Return -1 seems bug here
2015-12-10 17:35:35 +08:00
Anatol Belski
e2e39f3bfc
set release date
2015-12-10 08:11:23 +01:00
Xinchen Hui
29b615cfcf
iFixed key leak with invalid resource
2015-12-10 15:02:01 +08:00
Xinchen Hui
7c1ddcc67f
Fixed bug #71077 (ReflectionMethod for ArrayObject constructor returns wrong number of parameters)
2015-12-10 08:58:28 +08:00
Ferenc Kovacs
91adffb4d1
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
5.6.18 will be next
2015-12-10 01:31:51 +01:00
Ferenc Kovacs
7d5dbaed76
5.6.18 will be next
2015-12-10 01:30:27 +01:00
Anatol Belski
6f9819db38
fixed NEWS
2015-12-09 14:48:44 +01:00
Xinchen Hui
8ba6fea7b1
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-12-09 21:08:57 +08:00
Xinchen Hui
4c379392b2
Fixed bug #71067 (Local object in class method stays in memory for each call)
2015-12-09 21:07:59 +08:00
Anatol Belski
f444c7619e
update NEWS
2015-12-09 13:39:07 +01:00
Anatol Belski
3d487fb8d1
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2015-12-09 13:38:41 +01:00
Anatol Belski
e4238f4bf5
update NEWS
2015-12-09 13:37:37 +01:00
Anatol Belski
906670b817
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909 .
ext/dba/config.m4: Autodetect Berkeley DB v5.3.
fix path separator in test
Bumped SAPI version to 6.9
Added "mod_auth_basic" to apache module list.
Add sanitizing checks for request data.
Clear secret after use.
Fixed __DIR__ in CLI mode.
Add PDO_Firebird fix in NEWS
2015-12-09 12:05:01 +01:00
Michael Orlitzky
24f21a3012
ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909 .
...
The test program for utf8_to_mutf7 attempts to call it without
arguments. The function expects one argument, however, and this leads
to a segfault as reported in PHP bug #66909 .
The test program is using the PHP_IMAP_TEST_BUILD macro which
complicates things a little. To keep this diff small, the
PHP_IMAP_TEST_BUILD macro was modified to pass a fifth argument
"extra-source" to the PHP_TEST_BUILD macro. The check for
utf8_to_mutf7 was then modified to check for a dummy function,
utf8_to_mutf7_php, which passes the correct number of arguments to
utf8_to_mutf7.
PHP-Bug: https://bugs.php.net/bug.php?id=66909
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=376735
2015-12-09 12:04:16 +01:00
Anatol Belski
843341954e
update NEWS
2015-12-09 11:57:03 +01:00
Michael Orlitzky
05f00e5060
ext/dba/config.m4: Autodetect Berkeley DB v5.3.
...
When the user passes --with-db4=DIR to ./configure, the directory DIR
is searched for a number of paths in order of preference. These paths
contain possible locations for Berkeley DB (BDB) to be installed, and
since PHP only supports BDB-4.x and BDB-5.x, it's important that (for
example) version 5.1 be autodetected before falling back to
/usr/include/db.h which can point to BDB-6.x.
The newer BDB-5.3 works with PHP, and if only BDB-5.3 is installed on
the user's system, the current ./configure script is fine. However, if
both BDB-5.3 and BDB-6.0 are installed, version 5.3 is not
autodetected, causing BDB-6.0 to be used. The ./configure step then fails.
This commit adds autodetection for BDB-5.3, and fixes a bug reported
on Gentoo at https://bugs.gentoo.org/show_bug.cgi?id=564824 .
2015-12-09 11:37:50 +01:00
George Wang
6d933b463e
Bumped SAPI version to 6.9
2015-12-09 11:37:46 +01:00
George Wang
b3458eddfd
Added "mod_auth_basic" to apache module list.
2015-12-09 11:37:45 +01:00
George Wang
5a319a02d8
Add sanitizing checks for request data.
2015-12-09 11:37:43 +01:00
George Wang
af1ac753fe
Clear secret after use.
2015-12-09 11:37:42 +01:00
George Wang
42789e2b8a
Fixed __DIR__ in CLI mode.
2015-12-09 11:37:40 +01:00
Dmitry Stogov
4b16082e94
More verbose error messages
2015-12-09 13:34:45 +03:00
Michael Orlitzky
38b68fc042
ext/dba/config.m4: Autodetect Berkeley DB v5.3.
...
When the user passes --with-db4=DIR to ./configure, the directory DIR
is searched for a number of paths in order of preference. These paths
contain possible locations for Berkeley DB (BDB) to be installed, and
since PHP only supports BDB-4.x and BDB-5.x, it's important that (for
example) version 5.1 be autodetected before falling back to
/usr/include/db.h which can point to BDB-6.x.
The newer BDB-5.3 works with PHP, and if only BDB-5.3 is installed on
the user's system, the current ./configure script is fine. However, if
both BDB-5.3 and BDB-6.0 are installed, version 5.3 is not
autodetected, causing BDB-6.0 to be used. The ./configure step then fails.
This commit adds autodetection for BDB-5.3, and fixes a bug reported
on Gentoo at https://bugs.gentoo.org/show_bug.cgi?id=564824 .
2015-12-09 11:20:36 +01:00
Anatol Belski
56e7903131
fix path separator in test
2015-12-09 11:18:25 +01:00
Francois Laupretre
25abf2f028
Fix bug #70781 (Extension tests fail on dynamic ext dependency)
2015-12-09 11:05:34 +01:00
George Wang
00ed55005a
Bumped SAPI version to 6.9
2015-12-09 00:28:08 -05:00
George Wang
0d84097d44
Added "mod_auth_basic" to apache module list.
2015-12-09 00:27:55 -05:00
George Wang
08080c18f5
Add sanitizing checks for request data.
2015-12-09 00:26:41 -05:00
George Wang
c60d4b9770
Clear secret after use.
2015-12-09 00:26:24 -05:00
George Wang
84fd8ffa2a
Fixed __DIR__ in CLI mode.
2015-12-09 00:25:48 -05:00
Xinchen Hui
f248309b74
Revert "Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed)"
...
THis is bc break, which will break $date1->diff($date2 , 1), which is
common used
please do not do bc break without a asking
This reverts commit 943b23dcf6 .
2015-12-09 12:00:23 +08:00
Reeze Xia
943b23dcf6
Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed)
2015-12-09 11:40:47 +08:00
Xinchen Hui
0adbf6de77
Remove useless check
2015-12-09 11:37:40 +08:00
Xinchen Hui
84b997020e
Fixed bug #71066 (mb_send_mail: Program terminated with signal SIGSEGV, Segmentation fault)
2015-12-08 17:47:16 -08:00
Anatol Belski
adb9522767
move the entry into the correct NEWS block
2015-12-08 18:20:55 +01:00
Reeze Xia
10800b8ca2
Update NEWS
2015-12-09 00:41:18 +08:00
Xinchen Hui
c47b49c9b5
Fixed test if PATH is not set
2015-12-08 08:26:04 -08:00
Reeze Xia
3427c122bf
Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work)
2015-12-09 00:04:12 +08:00
Anatol Belski
e26b605c21
prepare 7.0.1RC1
2015-12-08 15:54:44 +01:00
Bob Weinand
a11805a4d9
PHP_MD5_CTX is now always used due to fix for #71204
2015-12-08 15:23:14 +01:00
Scott
c0ce2281bc
Update random.c
...
Supersedes #1589
2015-12-08 13:16:48 +01:00
Anthony Ferrara
908f67b1d4
Expose php_random_bytes as a first-class API within internals
...
This also defines two macros: php_random_bytes_throw and php_random_bytes_silent depending on use case which will throw exceptions or not respectively
2015-12-08 13:12:45 +01:00
Stanislav Malyshev
be19dbcb84
Fixed bug #70755 : fpm_log.c memory leak and buffer overflow
2015-12-08 00:10:07 -08:00
Stanislav Malyshev
4bb422343f
Fix bug #70976 : fix boundary check on gdImageRotateInterpolated
2015-12-07 23:33:05 -08:00
Xinchen Hui
0495bf5650
Revert "fix typos "paramer" -> "parameters""
...
ABI BC break
This reverts commit 6ac12f1337 .
2015-12-08 10:52:50 +08:00
Anatol Belski
920c088082
update NEWS
2015-12-07 22:54:44 +01:00
Anatol Belski
7c981192eb
Fixed bug #71024 Unable to use PHP 7.0 x64 side-by-side with PHP 5.6 x32 on the same server
2015-12-07 22:53:35 +01:00
Xinchen Hui
250430acdc
Fixed Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead of internal buffer)
2015-12-07 07:43:09 -08:00
Márcio Almada
6ac12f1337
fix typos "paramer" -> "parameters"
2015-12-07 14:48:26 +08:00
Xinchen Hui
e48988311d
Fixed bug #71020 (Use after free in Collator::sortWithSortKeys)
2015-12-07 10:58:26 +08:00
Stanislav Malyshev
2e157c5275
typofix
2015-12-06 14:07:39 -08:00
Joe Watkins
03a43d50e1
standard tsrm usage for seven
2015-12-06 14:06:07 +01:00
Anatol Belski
713ad54fec
update NEWS with fixed bug #70831
2015-12-06 12:41:51 +01:00
Daniel Axtens
2ea924fffc
Fix #70831 : Compile fails on system with 160 CPUs
...
This fixes the following build issue on 160-CPU POWER8 machines
ext/tokenizer/tokenizer_data.c:28:34: fatal error: zend_language_parser.h: No such file or directory
#include <zend_language_parser.h>
It is fixed by introducing an explicit dependency on the header file.
Signed-off-by: Daniel Axtens <dja@axtens.net >
2015-12-06 12:37:08 +01:00
Bob Weinand
aa8cac578e
Fix double free in formatted_print.c
2015-12-06 02:54:28 +01:00
Bob Weinand
559ede17e1
Fixed bug #71013 (Incorrect exception handler with yield from)
2015-12-06 02:45:19 +01:00
Nikita Popov
1d5744027e
Disable PEAR in Travis build
2015-12-05 22:48:29 +01:00
Xinchen Hui
311eb2b11e
Missed one place
2015-12-04 06:51:16 -08:00
Xinchen Hui
7ac24aa661
Fixed bug #71028 (Undefined index with ArrayIterator)
2015-12-04 06:45:26 -08:00
Xinchen Hui
3ae3341533
Fixed bug #71018 (ReflectionProperty::setValue() behavior changed)
2015-12-04 11:52:08 +08:00
Lior Kaplan
5b9267c4c0
Align NEWS entries format
2015-12-03 17:53:48 +02:00
Popa Adrian Marius
a154410597
Add PDO_Firebird fix in NEWS
2015-12-03 17:28:51 +02:00
Popa Adrian Marius
a90ce6de31
Add PDO_Firebird fix in NEWS
2015-12-03 17:23:56 +02:00
Popa Adrian Marius
9ddfd49063
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Use LL_MASK for SQL_INT64 data formatting
2015-12-03 17:13:45 +02:00
Popa Adrian Marius
8da5752311
Use LL_MASK for SQL_INT64 data formatting
2015-12-03 17:12:02 +02:00
Popa Adrian Marius
337fd3ad64
Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
...
* 'PHP-7.0' of https://git.php.net/push/php-src :
NEWS for 8907da99b8
Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
remove PHP 5 NEWS entries
2015-12-03 16:24:24 +02:00
Popa Adrian Marius
1745ead668
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
2015-12-03 16:15:18 +02:00
Popa Adrian Marius
4173a667fa
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
2015-12-03 16:14:17 +02:00
Andrea Faulds
3d6dd2a27b
NEWS for 8907da99b8
2015-12-03 12:16:15 +00:00
Dmitry Stogov
59424bb7bd
Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
2015-12-03 13:28:41 +03:00
Anatol Belski
2fabcbfedb
remove PHP 5 NEWS entries
2015-12-03 10:55:58 +01:00
Lior Kaplan
e322fb0015
SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG
...
Follow up for 3689b444
2015-12-02 19:30:05 +02:00
Anatol Belski
2f62ad16a4
remove older UPGRADING entry, bug #38409 is already fixed in 5.6
2015-12-01 11:32:52 +01:00
Adam Harvey
91bad929aa
Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).
...
We didn't initialise the retval variable in
php_cli_server_dispatch_router(); let's now initialise it to be
IS_UNDEF, as the following if condition expects.
2015-12-01 03:09:36 +00:00
Xinchen Hui
ed4b887cf6
Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element type)
2015-12-01 10:35:32 +08:00
Scott
00e3b7614e
Update random.c
...
Ref: https://github.com/jedisct1/libsodium/commit/beb826f6fd173cff4473c8b7614033dbd4803500
2015-12-01 10:33:33 +08:00
Anatol Belski
1b27754888
arrange NEWS for final and fix one NEWS mistake
2015-12-01 02:03:49 +01:00
Dmitry Stogov
25c5d185fc
Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)
2015-11-30 16:52:57 +03:00
Xinchen Hui
5df6f9f20e
Fixed bug #70993 (Array key references break argument processing)
2015-11-30 10:50:23 +08:00
Jakub Zelenka
e6e77d9e27
Fix typo in php_stream_from_res_no_verify
...
This macro is not used but it's wrong as zend_fetch_resource
accepts only 3 args and just one res index. So obviously
we need to use zend_fetch_resource2 here.
2015-11-29 19:28:25 +00:00
Xinchen Hui
4424cbf757
Order the NEWS
2015-11-28 23:48:12 -08:00
Xinchen Hui
1f65006fce
Fixed bug #70931 (Two errors messages are in conflict)
2015-11-28 23:43:41 -08:00
Xinchen Hui
9397f52724
Fixed Bug #70967 (Weird error handling for __toString when Error is thrown)
2015-11-28 23:38:19 -08:00
Xinchen Hui
5af61aa1cc
Space
2015-11-27 19:12:26 -08:00
Xinchen Hui
58fbe7a838
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-11-27 07:32:21 -08:00
Xinchen Hui
e9a8d7ff1d
Fixed bug #70977 , #70973 (Segmentation fault with opcache.huge_code_pages=1)
2015-11-27 07:30:37 -08:00
Andrea Faulds
8907da99b8
Set called_scope in Closure::call (fixes bug #70987 )
2015-11-27 15:06:13 +00:00
Xinchen Hui
a347b0be48
Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)
2015-11-27 15:52:55 +08:00
Xinchen Hui
b0f472b3b2
Fixed test
2015-11-27 11:42:30 +08:00
Xinchen Hui
6cb6c04499
Fixed bug #70982 (setStaticPropertyValue behaviors inconsistently with 5.6)
2015-11-27 11:32:38 +08:00
Nikita Popov
99dd7ee80b
Forbid namespace\int type hint as well
2015-11-26 16:56:08 +01:00
Xinchen Hui
0e91e5fb90
Fixed test
2015-11-26 12:00:25 +08:00
Bob Weinand
2de8915dea
Fixed bug causing exception not being thrown immediately into a generator yielding from an array
2015-11-25 23:09:44 +01:00
Christopher Jones
071247713f
Change line endings: Windows to Unix
2015-11-26 06:51:46 +11:00
Xinchen Hui
f96175750a
Fixed NEWs again (not sure why this is messd up twice today)
2015-11-25 08:04:36 -08:00
Xinchen Hui
4a7e83f54a
Fixed bug #70970 (Segfault when combining error handler with output buffering)
...
of course we can try to refactor the current flow to make this error can
be catched safly.
but as 7.0.0 is releasing, I don't think a refactor is safe now. and
actually I don't see any gain to make this catchable.
so let's keep this be consistent with 5.6 and safe for now
2015-11-25 08:00:20 -08:00
Xinchen Hui
0394c04144
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-11-25 06:34:40 -08:00
Xinchen Hui
9376e8213c
ZEND_SPACESHIP supports
2015-11-25 20:20:05 +08:00
Xinchen Hui
1b6873b4e6
Fixed NEWS
2015-11-25 19:15:33 +08:00
Xinchen Hui
d6f39a1011
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-11-25 19:12:40 +08:00
Xinchen Hui
3cdbe347ae
Always lower name
2015-11-25 19:11:22 +08:00
Xinchen Hui
05738eb71a
Revert "Improved fix for Fully qualified (leading backslash) type names must fail"
...
This reverts commit 00865ae22f .
2015-11-25 19:06:42 +08:00
Bob Weinand
73a92964ff
Fixed bug #70965 (yield from with a common iterator primes too much)
2015-11-25 09:54:24 +01:00
Anatol Belski
2bae178b35
fix NEWS
2015-11-25 05:03:15 +01:00
Xinchen Hui
0134de7cff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-11-25 11:46:14 +08:00
Xinchen Hui
00865ae22f
Improved fix for Fully qualified (leading backslash) type names must fail
...
it now all fails with COMPILE_ERROR instead of syntax error for T_ARRAY
but COMPILE_ERROR for int
2015-11-25 11:27:32 +08:00
Anatol Belski
541631253a
rearrange NEWS for RC8
2015-11-25 03:39:28 +01:00
Christopher Jones
7be30eb78c
Improve test portability
2015-11-25 12:43:05 +11:00
Christopher Jones
d10ee1eef1
Fix remaining gcov valgrind issues
2015-11-25 12:42:27 +11:00
Bob Weinand
80d9dcafe0
Fixed bug #70904 (yield from incorrectly marks valid generator as finished)
2015-11-24 23:43:34 +01:00
Bob Weinand
569763cb1a
Fix scalar type names with leading backslash
2015-11-24 21:39:06 +01:00
Xinchen Hui
d978e92d3d
Update NEWS
2015-11-24 13:45:56 +08:00
Xinchen Hui
e637ead6ed
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-24 13:45:32 +08:00
Xinchen Hui
e6b46dc2ff
Fixed bug #70960 (ReflectionFunction for array_unique returns wrong number of parameters)
2015-11-24 13:45:16 +08:00
Xinchen Hui
fd545f4f44
Also fixed 'r'
2015-11-24 11:48:03 +08:00
Xinchen Hui
3e0b2ba5d8
Indent (not sure why it was messed)
2015-11-24 11:08:30 +08:00
Xinchen Hui
31b4581c45
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-11-24 11:05:56 +08:00
Xinchen Hui
91fb1edbbf
Fixed bug #70963 (Unserialize shows UNKNOW in result)
...
Thanks to ryat for reportinig
2015-11-24 11:04:42 +08:00
Côme Bernigaud
e6759644ec
Revert "Added back support for undocummented host:port syntax"
...
This reverts commit 15876e85e5 .
2015-11-24 03:45:21 +01:00
Côme Bernigaud
5a8bcf73ba
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
...
This reverts commit 391087ed28 .
2015-11-24 03:45:17 +01:00
Lior Kaplan
a8bd182ccd
Align NEWS entries format
2015-11-23 19:00:42 +02:00
Lior Kaplan
818bffc534
Add NEWS entry for #61751
2015-11-23 18:58:03 +02:00
Lior Kaplan
9642710a09
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
Conflicts:
sapi/cgi/config9.m4
sapi/fpm/config.m4
2015-11-23 18:56:13 +02:00
Lior Kaplan
1c72e5b299
Align NEWS entries format
2015-11-23 18:46:19 +02:00
Bob Weinand
c1189eccae
Output stderr on real stderr in phpdbg
2015-11-23 17:46:07 +01:00
Lior Kaplan
532912d8ab
Add NEWS entry for #61751
2015-11-23 18:42:21 +02:00
Lior Kaplan
d6b78a3511
Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
2015-11-23 18:40:47 +02:00
Xinchen Hui
7e9f416218
Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)
2015-11-23 23:15:33 +08:00
Xinchen Hui
f8bf1f33a5
Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)
2015-11-23 07:08:47 -08:00
Xinchen Hui
801e46d8c0
Add test for bug (count on symbol table)
...
I should have do this ....
2015-11-23 06:21:30 -08:00
Xinchen Hui
6313e16a04
Improved fix for bug (count on symbol table)
2015-11-23 06:12:03 -08:00
Xinchen Hui
8c51578c81
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-23 18:48:51 +08:00
Xinchen Hui
b9845e5006
Add bug #70957 and #70958 releated test in refection
2015-11-23 18:48:21 +08:00
Xinchen Hui
45c5e27183
Fixed test
2015-11-23 18:33:14 +08:00
Xinchen Hui
51ccc88b87
Port fix to 7.0
2015-11-23 18:31:56 +08:00
Xinchen Hui
397be4ff54
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
Zend/zend_compile.c
2015-11-23 18:30:41 +08:00
Xinchen Hui
a2b85ddecf
Fixed bug #70958 (Invalid opcode while using ::class as trait method paramater default value)
2015-11-23 18:29:59 +08:00
Xinchen Hui
1b16c2f41c
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
Zend/zend_compile.c
2015-11-23 12:22:17 +08:00
Xinchen Hui
ab17840d33
Fixed bug #70957 (self::class can not be resolved with reflection for abstract class)
2015-11-23 12:20:44 +08:00
Xinchen Hui
eada2aa91a
Fixed bug (count on symbol tables)
2015-11-21 20:58:29 -08:00
Xinchen Hui
31d93fcf4b
Port the fix of 5.6 to 7.0
2015-11-21 05:41:53 -08:00
Xinchen Hui
c6961cb41b
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
Zend/tests/bug70944.phpt
Zend/zend_exceptions.c
2015-11-21 05:03:20 -08:00
Xinchen Hui
205e0ba81d
Update test script
2015-11-21 05:01:51 -08:00
Xinchen Hui
cbc71995a8
Unused var
2015-11-21 04:54:48 -08:00
Xinchen Hui
7b195c9875
Improved fix for bug #70944
2015-11-21 00:27:56 -08:00
Xinchen Hui
4674f18a4b
Improved previously fix a little
2015-11-20 06:54:57 -08:00
Xinchen Hui
519f9bc675
Fixed bug #70947 (INI parser segfault with INI_SCANNER_TYPED)
2015-11-20 06:37:38 -08:00
Xinchen Hui
2a9fc35e51
Update NEWS
2015-11-20 16:38:24 +08:00
Xinchen Hui
a2e4e64682
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
Zend/zend_exceptions.c
2015-11-20 16:38:00 +08:00
Xinchen Hui
a1c887964e
Fixed bug #70944 (try{ } finally{} can create infinite chains of exceptions)
2015-11-20 16:24:53 +08:00
Xinchen Hui
64a90a6b98
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-20 15:36:26 +08:00
Xinchen Hui
b42eb16cf4
This seems better
2015-11-20 15:36:13 +08:00
Xinchen Hui
7e68d6e735
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-20 15:22:45 +08:00
Xinchen Hui
c8d6673b59
Fixed build error "undefined symbol gdJpegGetVersionString"
2015-11-20 15:22:05 +08:00
Christopher Jones
f66e25a82b
Fixed LOB implementation size_t/zend_long mismatch reported by gcov
2015-11-20 09:14:05 +11:00
Christopher Jones
8b32fe80ae
Stablize test on Windows
2015-11-20 09:13:47 +11:00
Remi Collet
77e9f2d6b1
typo
2015-11-19 09:20:13 +01:00
Remi Collet
1bd22e8e65
NEWS
2015-11-19 08:19:04 +01:00
Remi Collet
6680c2b22e
Fixed bug #70940 Segfault in soep / type_to_string
2015-11-19 08:18:13 +01:00
Bob Weinand
4dee0c4a14
Fixed bug #70899 (buildconf failure in extensions)
2015-11-17 21:07:29 +01:00
Xinchen Hui
4f0a05ab3e
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-17 20:14:11 +08:00
Xinchen Hui
66c1f966f0
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-11-17 20:13:22 +08:00
Xinchen Hui
fba3985f23
Improve the test
2015-11-17 20:12:50 +08:00
Andrey Hristov
96406f0842
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-16 12:39:04 +01:00
Andrey Hristov
822400ef3b
News for fixed bug #68344
2015-11-16 12:38:25 +01:00
Xinchen Hui
9134f9e98f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08:00
Xinchen Hui
25439e939e
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-11-16 17:00:16 +08:00
Xinchen Hui
be6fd4ba89
Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
...
Actually, this only be fixed if php uses mysqlnd
2015-11-16 16:59:55 +08:00
Côme Bernigaud
15876e85e5
Added back support for undocummented host:port syntax
2015-11-16 04:50:12 +01:00
Christopher Jones
0dce4bef79
Fixed LOB mem leak reported on gcov. Also fixed unsigend comparison compile warning; and remove direct field access
2015-11-16 08:15:22 +11:00
Jakub Zelenka
3c32019989
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-15 19:13:49 +00:00
Jakub Zelenka
e5abc53701
Use the same CS for all json tests
2015-11-15 19:06:09 +00:00
Anatol Belski
7819fef345
Fixed bug #70917 install-pear-nozlib.phar missing
...
The actual bug is caused by some network error while packaged. An
error check added to interrupt the packaging process if phar package
download failed.
2015-11-15 19:01:22 +01:00
Reeze Xia
c856b6e0ff
Update mime type generator script to keep track of additional mime-types
2015-11-15 20:25:47 +08:00
Thorsten Rinne
04c3fbac37
Added support for CSS/JavaScript source maps
...
Source maps (http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/ ) are basically a way to map a combined/minified file back to an unbuilt state. To avoid error messages in Browser DevTools, source map files should be served with the MIME type "application/json"
2015-11-15 20:25:39 +08:00
Anatol Belski
1934d6d9ab
fix test title
...
c/p mistake :)
2015-11-15 00:03:40 +01:00
Anatol Belski
e3d19e81a2
update NEWS
2015-11-14 23:48:40 +01:00
Taoguang Chen
617698dfe0
Fixed bug #70914 zend_throw_or_error() format string vulnerability
2015-11-14 23:44:59 +01:00
Xinchen Hui
c2773ea02f
Update NEWs
2015-11-14 01:14:36 -08:00
Xinchen Hui
fce44a5a13
Fixed bug #70910 (extract() breaks variable references)
2015-11-13 19:39:59 -08:00
Xinchen Hui
25de928df7
Fixed bug #70912 (Null ptr dereference instantiating class with invalid array property)
2015-11-13 21:24:42 +08:00
Yasuo Ohgaki
a03786f773
Use distinguishable error messages.
2015-11-13 21:25:10 +09:00
Xinchen Hui
310fc87c2d
SKIP on slow debug version PHP
2015-11-13 14:00:01 +08:00
Dmitry Stogov
04526093e4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-12 20:36:39 +03:00
Dmitry Stogov
f8bf9bd86b
Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-12 20:31:52 +03:00
Anatol Belski
cc10da474d
fixed typo
2015-11-12 13:37:45 +01:00
Anatol Belski
9c4fd36783
add test for bug #70898
2015-11-12 09:28:10 +01:00
Xinchen Hui
c2de445f79
Also protects this one
2015-11-12 14:51:19 +08:00
Xinchen Hui
2b494ecc9c
Update NEWS
2015-11-12 14:38:44 +08:00
Xinchen Hui
53c03115cf
Re-fixed #70895
2015-11-12 14:35:34 +08:00
Xinchen Hui
2bed2152e6
Revert "Fixed bug Bug #70895 null ptr deref and segfault"
...
This reverts commit 8eef11d317 .
2015-11-12 14:34:00 +08:00
Xinchen Hui
c245fd7d91
Revert "refix bug #70895 "
...
This reverts commit 93240102e0 .
2015-11-12 14:33:14 +08:00
Xinchen Hui
75f85288f4
Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))"
...
This reverts commit e4e54f33ce .
2015-11-12 14:32:35 +08:00
Xinchen Hui
fc611a134b
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-12 14:20:03 +08:00
Xinchen Hui
e4e54f33ce
Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))
...
Include tail \0
2015-11-12 14:18:02 +08:00
Côme Bernigaud
391087ed28
Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
...
Note that passing 0 will also result in default port.
2015-11-12 07:06:05 +01:00
Anatol Belski
a1e8b74827
update NEWS
2015-11-12 01:41:59 +01:00
Anatol Belski
93240102e0
refix bug #70895
...
move this code to where it belongs, no behavior change to actual
throwing function, thus retaining compat with old ZPP
2015-11-12 01:39:02 +01:00
Anatol Belski
8eef11d317
Fixed bug Bug #70895 null ptr deref and segfault
2015-11-12 00:52:36 +01:00
Anatol Belski
a2e59e72bc
fix format macro names in UPGRADING.INTERNALS
2015-11-11 16:33:34 +01:00
Ferenc Kovacs
2777d0a1d9
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Ensure the test fails
2015-11-11 14:59:31 +01:00
Xinchen Hui
f72c7edfa4
Ensure the test fails
2015-11-11 14:55:33 +01:00
Xinchen Hui
88fb6d90c4
Ensure the test fails
2015-11-11 19:51:33 +08:00
Anatol Belski
3517f85e47
update NEWS, patch for #70249 pulled into RC7
2015-11-11 12:20:18 +01:00
Anatol Belski
b89f451694
adjust test expectation
2015-11-11 09:47:29 +01:00
Anatol Belski
3cdc438e53
fix test filename and title
2015-11-11 09:47:24 +01:00
Ferenc Kovacs
1f39665083
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
propare for 5.6.16RC1
2015-11-11 09:21:32 +01:00
Ferenc Kovacs
b22636c838
propare for 5.6.16RC1
2015-11-11 09:20:16 +01:00
Xinchen Hui
82f503f587
Re-Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)
...
Let's fixed this in the root instead
2015-11-11 12:32:46 +08:00
Xinchen Hui
c3260b66c9
Revert "Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)"
...
This reverts commit d6c527830e .
2015-11-11 12:06:38 +08:00
Xinchen Hui
d6c527830e
Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)
...
Maybe we should introduce a new zend_hash_safe_apply which always reload
the ht->arData to make sure won't segfault the ht is grew?
2015-11-11 11:34:11 +08:00
Bob Weinand
ccf8b54b89
Use --vex-iropt-precise-memory-exns=yes for valgrind < 3.8.0
2015-11-10 09:27:49 +01:00
Matteo Beccati
3cb3979de3
Split shmop/tests/002.phpt in two (all + non-root)
...
One of the conditions tested was expected to fail with "Permission denied",
but it doesn't when running as root. The memory segment was also leaked, hence
the split.
2015-11-10 09:10:10 +01:00
Matteo Beccati
6fa9b76342
Fix bug #70886 in shmop/tests/002.phpt
2015-11-10 09:10:10 +01:00
Xinchen Hui
4803914ae6
Unused var
2015-11-10 15:54:32 +08:00
Dmitry Stogov
d66d1b97aa
Fixed incorrect order of free/finally on exception
2015-11-10 10:10:39 +03:00
Anatol Belski
795af791b0
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
2015-11-10 00:41:40 +01:00
Andrea Faulds
37b64de20f
Merge branch 'use_ZEND_STRL_for_builtin_types' into PHP-7.0
2015-11-09 23:40:49 +00:00
Anatol Belski
a3f1154b3d
additional catch to bug #70863
2015-11-10 00:38:11 +01:00
Anatol Belski
2e38918ba4
add test for eb32da13
2015-11-09 22:45:22 +01:00
Dmitry Stogov
c9eacb181c
Added tests
2015-11-09 23:54:09 +03:00
Anatol Belski
e029a86aad
prepare news for next
2015-11-09 19:39:02 +01:00
Jakub Zelenka
570cdc05d7
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-09 18:23:29 +00:00
Jakub Zelenka
1a12403002
Remove SNI test that trigger request to sni.velox.ch
...
This has been requested by Kaspar Brand who provides
sni.velox.ch. That site is only for interactive
testing and not for unit/integration/regression testing.
Although this test is run only in special cases (when
SNI_TESTS is defined) it should still be removed.
Also this test is not reliable as it depends on external
resources.
2015-11-09 18:11:18 +00:00
Andrea Faulds
dae37661d9
Use ZEND_STRL macro for builtin_types
2015-11-09 11:15:58 +00:00
Xinchen Hui
d70aa14f2c
Fixed bug #70323 (Regression in zend_fetch_debug_backtrace() can cause segfaults)
2015-11-09 17:14:15 +08:00
Xinchen Hui
0a1e199682
Fixed bug #70624 opcache.huge_code_pages
2015-11-09 12:21:45 +08:00
Xinchen Hui
12f1cfa86a
Update NEWS
2015-11-09 12:02:27 +08:00
Caleb Champlin
6ff014b31c
Make sure context is set to null to prevent use after free
2015-11-09 11:58:34 +08:00
Xinchen Hui
fe12492480
Merge branch 'patch-1' of https://github.com/colinodell/php-src into PHP-7.0
2015-11-07 23:06:41 -08:00
Xinchen Hui
83de5364b7
manually apply the typo fix in master
2015-11-07 23:03:25 -08:00
Lynn
269674f79d
rm duplicate include
2015-11-07 23:01:23 -08:00
James Titcumb
bb55ac6279
Fixed typo in reflection phpt
2015-11-07 22:58:56 -08:00
Colin O'Dell
55abf6dfb2
Fix description of a BC break
2015-11-07 17:48:02 -05:00
Nikita Popov
bc3512c1d6
Fix various update_opN_const issues
2015-11-07 17:45:26 +01:00
Nikita Popov
9da456655c
Refactor update_op2_const
...
Combines both switches into one, to avoid having to maintain the same
opcode list twice. This also makes most of the bugs fixed by the next
commit pretty obvious.
No functional change here.
2015-11-07 17:31:09 +01:00
Xinchen Hui
de8bfb32bd
Use defined macro
2015-11-07 07:43:18 -08:00
Xinchen Hui
e9fd8ad446
Fixed bug #70876 (Segmentation fault when regenerating session id with strict mode)
2015-11-07 07:30:31 -08:00
Xinchen Hui
148bb622fa
Revert "Fixed bug #70876 Segmentation fault when regenerating session id with strict mode"
...
This reverts commit 0bf3ebb4ba .
2015-11-07 07:17:43 -08:00
Xinchen Hui
2d8d97cee2
Fixed bug #70873 (Regression on private static properties access)
2015-11-07 06:50:36 -08:00
Reeze Xia
c524f43e4f
C99 complain fix
2015-11-07 22:15:19 +08:00
Reeze Xia
e4c1e90536
Update NEWS
2015-11-07 22:10:56 +08:00
Reeze Xia
0bf3ebb4ba
Fixed bug #70876 Segmentation fault when regenerating session id with strict mode
...
The comment *mod_data always be non-NULL is not true.
The same as this FIXME: https://github.com/php/php-src/blob/master/ext/session/mod_files.c#L676
2015-11-07 21:46:21 +08:00
Nikita Popov
99d818f1e9
Don't propagate into ops that error on non-string
...
To properly support this make update_opN_const fallible -- they
are not always called through replace_with_const.
2015-11-07 12:04:51 +01:00
Nikita Popov
00b37e718d
Strip leading backslash in update_opN_const
2015-11-07 12:04:51 +01:00
Nikita Popov
632bee4abb
Fix update_opX_const lowercasing
...
It was lowering in-place.
2015-11-07 12:04:51 +01:00
Matteo Beccati
c263dcee2f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
2015-11-07 11:05:36 +01:00
Matteo Beccati
fd61666d96
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
2015-11-07 11:00:33 +01:00
Matteo Beccati
f2853386b1
Merge remote-tracking branch 'origin/PHP-5.6' into PHP-7.0
...
* origin/PHP-5.6:
Always remember NEWS....
Fix compile warnings about comparison of unsigned expression always being true
Bump OCI8 version
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
2015-11-07 10:46:17 +01:00
Anatol Belski
0cbf3afe17
update NEWS
2015-11-06 23:08:18 +01:00
Anatol Belski
d59eb9fcc3
fix decrement_function regarding bug #70863
2015-11-06 23:07:21 +01:00
Anatol Belski
8155ecba61
Fixed bug #70863 Incorect logic to increment_function for proxy objects
2015-11-06 23:07:16 +01:00
Anatol Belski
6897c1116a
no more dev ZEND_VERSION
2015-11-06 23:07:10 +01:00
Bob Weinand
855bb36fd0
Add support for IPV6_V6ONLY on sockets
2015-11-06 21:45:31 +01:00
Christopher Jones
049325ca96
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
2015-11-07 02:24:17 +11:00
Christopher Jones
089ca134fb
Always remember NEWS....
2015-11-07 02:15:24 +11:00
Christopher Jones
a57b205383
Fix compile warnings about comparison of unsigned expression always being true
2015-11-07 02:14:18 +11:00
Christopher Jones
f88a9a9643
Bump OCI8 version
2015-11-07 02:10:57 +11:00
Christopher Jones
3060dfd92e
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
2015-11-07 01:56:50 +11:00
Xinchen Hui
27aef97f65
Fixed bug #70868 (PCRE JIT and pattern reuse segfault)
2015-11-06 11:37:17 +08:00
Márcio Almada
283b6275df
add failing test for bug #70868
2015-11-06 11:34:45 +08:00
Anatol Belski
aa0d441ede
update NEWS
2015-11-05 22:51:25 +01:00
Anatol Belski
01c844a01d
use Z* macro name
2015-11-05 22:39:10 +01:00
Anatol Belski
2283551cfa
fix NULL deref in mbstring post handler
2015-11-05 22:24:47 +01:00
Anatol Belski
c1f893d894
fix NULL deref in pdo_firebird
...
ref #70862
2015-11-05 22:11:00 +01:00
Anatol Belski
cff9e16a12
fix pdo_sqlite crash with empty bound stream
2015-11-05 21:50:34 +01:00
Anatol Belski
1406f80135
fix leak
2015-11-05 21:49:21 +01:00
Anatol Belski
7b32b8f4e1
fix pdo_mysql crash with empty bound stream param
...
rel #70862
2015-11-05 21:32:31 +01:00
Anatol Belski
1184f0aca5
add test for bug #70861
2015-11-05 19:48:08 +01:00
Fabian Franz
1fcadf67e6
Fix setting of empty string resource.
2015-11-05 19:47:12 +01:00
Anatol Belski
f189353178
fix possible NULL deref in image functions
2015-11-05 18:16:32 +01:00
Anatol Belski
5ac288bcc6
fix crash in sqlite when executing with bound stream param
...
rel #70862
2015-11-05 18:08:08 +01:00
Anatol Belski
9385eb6ff8
re-update NEWS
2015-11-05 14:48:30 +01:00
Anatol Belski
a80545992b
update the actual sql parser file for #70861
2015-11-05 14:46:40 +01:00
Anatol Belski
5c96a91d77
Fix bug #70861 Segmentation fault in pdo_parse_params() during Drupal 8 test suite
2015-11-05 14:46:28 +01:00
Anatol Belski
9968129831
don't get invalid chmod mode through
2015-11-05 14:46:23 +01:00
Anatol Belski
dea14fc707
zero cwd buffer before passing to chmod
2015-11-05 14:46:18 +01:00
Reeze Xia
435565a54f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Make test for bug #70852 to cover all cases
Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.
2015-11-05 14:28:49 +08:00
Reeze Xia
1c0622a472
Make test for bug #70852 to cover all cases
2015-11-05 14:09:24 +08:00
Reeze Xia
51218b3b9d
Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.
2015-11-05 13:46:03 +08:00
Xinchen Hui
e4ac4e75b5
Fixed bug #70853 (SplFixedArray throws exception when using ref variable as index)
2015-11-04 06:44:29 -08:00
Xinchen Hui
fe0af271c6
Fixed bug #70843 (Segmentation fault on MacOSX with opcache.file_cache_only=1)
2015-11-04 18:59:30 +08:00
Xinchen Hui
2f2653aa77
Fixed bug #70805 (Segmentation faults whilst running Drupal 8 test suite)
2015-11-03 17:53:56 -08:00
Xinchen Hui
d7ff107654
Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on some platforms)
2015-11-02 16:43:28 +08:00
Xinchen Hui
8dd5e1c2b5
Add test_fpm_conf to skip some tests ranth than mark --xfail--
2015-11-02 16:42:11 +08:00
Xinchen Hui
8d443d4626
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-02 10:59:07 +08:00
Xinchen Hui
227c898cd9
Fixed test
2015-11-02 10:58:55 +08:00
Xinchen Hui
63c601b631
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-02 10:55:05 +08:00
Xinchen Hui
a23a88b3e7
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-11-02 10:47:32 +08:00
Xinchen Hui
37ed0dafe4
Fixed bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant)
2015-11-02 10:47:02 +08:00
Jakub Zelenka
e62db72111
Use standard title for new openssl tests
2015-10-29 19:11:57 +00:00
root
06c6b51e7d
new tests to openssl module, don't covered yet.
2015-10-29 19:06:40 +00:00
Andrey Hristov
6d51b7b2e3
Another Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
...
Added the possibility to explicitly state that the peer certificate should not be checked.
Back to the default - checking the certificate.
Exported MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
Usage : mysqli_real_connect( , , , , , MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT)
If mysqli_ssl_set() is not called, but only MYSQLI_CLIENT_SSL is passed, without the (don't) very flag,
then no verification takes place.
2015-10-27 12:59:09 +01:00
Xinchen Hui
008d8b6789
Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)
2015-10-26 17:28:19 -07:00
Xinchen Hui
31553f07f2
Revert "Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)"
...
This reverts commit 3ef96c2cc6 .
2015-10-26 17:26:30 -07:00
Xinchen Hui
3ef96c2cc6
Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)
2015-10-26 17:09:42 -07:00
Leigh
faf835be2b
Use arc4random on OpenBSD 5.5+ and NetBSD 7+
...
As discussed with @weltling, keeping arc4random on the condition that the OS has a solid implementation of it
2015-10-30 19:08:20 +00:00
Reeze Xia
c4297a5a29
This couldn't be false as it has been checked before
2015-10-30 19:50:54 +08:00
Reeze Xia
68b431e37d
Use h parameter to avoid duplicate ht access of array_combine()
2015-10-30 19:49:04 +08:00
Dmitry Stogov
3c5a3e77d4
Fixed incomplete initialization.
2015-10-30 07:15:56 +03:00
Jakub Zelenka
41de89f61b
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-29 19:14:25 +00:00
Dmitry Stogov
c67fc6bb09
Fixed memory leak in php_stream_context_set_option()
2015-10-29 20:06:55 +03:00
Xinchen Hui
241e340f78
Make these tests fail faster, Thanks to GFW
2015-10-29 15:01:43 +08:00
Xinchen Hui
661798ad34
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-10-29 14:35:31 +08:00
Xinchen Hui
179fba3f38
Fixed bug #70808 (array_merge_recursive corrupts memory of unset items)
...
I knew, this fix seems ugly
2015-10-29 14:33:58 +08:00
Julien Pauli
eb59dd7d81
Don't remap .text segment if huge pages are not available.
2015-10-29 08:44:19 +03:00
Andrey Hristov
2b23ba97f3
Fix mysqli tests
2015-10-28 12:56:12 +01:00
Anatol Belski
5dd59cc90d
sync NEWS
2015-10-27 20:10:06 +01:00
Anatol Belski
ac4601eadd
7.0.1 is next
2015-10-27 20:08:54 +01:00
Dmitry Stogov
eb32da13cd
Fix frequent reallocations with many small strings
2015-10-27 17:07:58 +01:00
Anatol Belski
0e50a4c008
correct snprintf usage
2015-10-27 17:07:51 +01:00
Andrey Hristov
c133515811
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-27 13:32:45 +01:00
Leigh
a53510239f
Remove arc4random
...
There has been a lot of discussion around whether arc4random should be included. Given how many different impementations of it are in the wild, we can't guarantee a secure implementation on all platforms.
2015-10-26 20:40:28 +00:00
Anatol Belski
fff11a1e07
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
unbreak coverage data: fix #line directives in phpdbg parser
exclude datelib from coverage report as asked by Derick
2015-10-26 15:57:26 +01:00
Anatol Belski
2f7a8515ca
update NEWS
2015-10-26 15:56:34 +01:00
Anatol Belski
83bfefeccb
Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
2015-10-26 15:54:29 +01:00
Dmitry Stogov
0172f198e3
Fixed inconsistent exception handling (uopz/tests/006.phpt was failed when PHP build with --disable-gcc-global-regs).
2015-10-26 16:01:20 +03:00
Xinchen Hui
5767f2b648
Fixed bug #70785 (Infinite loop due to exception during identical comparison)
2015-10-26 11:15:17 +08:00
Jakub Zelenka
2ee99f8954
Check EVP_SealFinal return code
...
This can be done since we no longer support OpenSSL 0.9.6
2015-10-25 17:53:39 +00:00
Bob Weinand
ac58d21aa3
Fix refcount reaching 2^32 - 1 for resources
...
Happens e.g. in proc_close() when nothing is referencing the file handles, e.g. they have refcount 0 when passed to zend_list_close() and then zend_list_delete() which decrements it to (uint32_t) -1
2015-10-25 18:47:50 +01:00
Nuno Lopes
36311ee4fd
unbreak coverage data: fix #line directives in phpdbg parser
2015-10-24 18:12:24 -04:00
Nuno Lopes
a0665f3a18
unbreak coverage data: fix #line directives in phpdbg parser
2015-10-24 17:45:53 -04:00
Nuno Lopes
0e069fa57d
exclude datelib from coverage report as asked by Derick
2015-10-24 17:38:20 -04:00
Nuno Lopes
87498c5c39
exclude datelib from coverage report as asked by Derick
2015-10-24 17:37:00 -04:00
Nikita Popov
b9cc3176eb
Fix bug #70782
2015-10-24 23:19:02 +02:00
Anatol Belski
aae108c1ce
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix globals initialization in sapi/cgi
2015-10-23 13:59:27 +02:00
Anatol Belski
22af88274b
Fix globals initialization in sapi/cgi
...
Basically backport 8430ec17
2015-10-23 13:56:40 +02:00
Anatol Belski
448d1ce428
rather use the supplied inttypes.h with vc14
2015-10-23 09:47:00 +02:00
Anatol Belski
5ba763413b
fix test redirection when run not from source root
2015-10-23 09:42:19 +02:00
Xinchen Hui
95446b4416
Indents
2015-10-23 11:19:30 +08:00
c9s
bbaf6daa9d
Fix boolean conversion warnings
...
Summary:
The compiler complains and raised some warnings about boolean
conversion:
warning: address of 'ce->constants_table' will always evaluate to
'true' [-Wpointer-bool-conversion]
Since the address of 'HashTable' will always evaluate to true. the
condition should be removed. The scope is kept for local variables.
Platform:
OS X 10.11
Compiler:
Apple LLVM version 7.0.0 (clang-700.0.72)
Target: x86_64-apple-darwin15.0.0
Thread model: posix
2015-10-23 11:19:19 +08:00
Andrey Hristov
3dc0bf7428
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-22 11:50:12 +02:00
Andrey Hristov
afd31489d0
Improve fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
2015-10-22 11:48:53 +02:00
Andrey Hristov
8f9b2b68ee
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-21 15:52:38 +02:00
Andrey Hristov
8292260515
Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
2015-10-21 15:10:24 +02:00
Andrey Hristov
efd2b3f5f2
Update the certificates needed for the mysqli tests
2015-10-21 10:42:51 +02:00
Bob Weinand
2ef327caed
Exempt paging from -qrr mode
2015-10-20 21:56:00 +02:00
Anatol Belski
1149833a58
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
backport 262160e and 2d55e8c into 5.6
2015-10-20 20:07:14 +02:00
Anatol Belski
ccc95bf9df
backport 262160e and 2d55e8c into 5.6
2015-10-20 20:05:44 +02:00
Xinchen Hui
6ad2c3eb33
Revert "Ensure proper exception handling and EX(opline) state in USER_OPCODE handler"
...
read: http://news.php.net/php.internals/88887
This reverts commit 808f62bb4d .
2015-10-20 08:12:04 -07:00
Xinchen Hui
673ad62eed
Regenerate zend_ini_scanner.c
2015-10-20 16:58:30 +08:00
Xinchen Hui
a5a5c3e09a
Update NEWS
2015-10-20 13:26:40 +08:00
Xinchen Hui
c7cb40353c
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
Zend/zend_ini_scanner.c
2015-10-20 13:26:02 +08:00
Xinchen Hui
d5f76caf6c
Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)
2015-10-20 13:20:56 +08:00
Ferenc Kovacs
131a348d37
remove imap tests for now until I finish the sudoless dovecot config
2015-10-19 23:57:43 +02:00
Ferenc Kovacs
fa0ffa4777
remove imap tests for now until I finish the sudoless dovecot config
2015-10-19 23:43:26 +02:00
Ferenc Kovacs
03e1e88db1
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fixup, both catched by nikic
use another character device in this test as /dev/console seems that it is different for lxc containers
the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
let's try running our testsuite without sudo
2015-10-19 23:02:52 +02:00
Ferenc Kovacs
395ef4efb7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixup, both catched by nikic
use another character device in this test as /dev/console seems that it is different for lxc containers
the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
let's try running our testsuite without sudo
2015-10-19 22:47:23 +02:00
Ferenc Kovacs
f3838a9c35
Merge branch 'pr-1483' into PHP-5.5
...
* pr-1483:
fixup, both catched by nikic
use another character device in this test as /dev/console seems that it is different for lxc containers
the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
let's try running our testsuite without sudo
2015-10-19 22:44:19 +02:00
Stanislav Malyshev
26e5429f72
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #64172
Bug #70561 : Fix DirectoryIterator to throw OutOfBoundsException
Conflicts:
ext/pdo/pdo_dbh.c
2015-10-18 17:20:00 -07:00
Stanislav Malyshev
0b35e0c5a1
Merge branch 'pull-request/1535' into PHP-5.6
...
* pull-request/1535:
Bug #70561 : Fix DirectoryIterator to throw OutOfBoundsException
2015-10-18 17:17:55 -07:00
Daniel Persson
73384728ca
Fix bug #64172
...
Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.
2015-10-18 17:06:54 -07:00
Daniel Persson
307c1f6bf0
Fix bug #64172
...
Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.
2015-10-18 17:03:39 -07:00
Stanislav Malyshev
c7c6df6cec
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Skip some tests for platforms different than x86
2015-10-18 15:45:40 -07:00
Fábio Perez
c76fd640e6
Skip some tests for platforms different than x86
...
These tests are verifying undefined behaviour such as shifting by more than 63
bits and by negative numbers.
2015-10-18 15:45:25 -07:00
Stanislav Malyshev
5f759b04b8
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Skip serialize test if ext/session is not loaded
Conflicts:
ext/standard/tests/serialize/bug70219_1.phpt
2015-10-18 15:44:59 -07:00
Stanislav Malyshev
b94f67885c
Skip serialize test if ext/session is not loaded
2015-10-18 15:43:03 -07:00
Stanislav Malyshev
6a4803026d
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Remove wrong argument $session from SNMP::setSecurity()
Fix SNMP::setSecurity() arginfo (Fixes bug #70476 )
2015-10-18 14:51:13 -07:00
jubianchi
718445b096
Remove wrong argument $session from SNMP::setSecurity()
2015-10-18 14:48:39 -07:00
jubianchi
39a2514643
Fix SNMP::setSecurity() arginfo (Fixes bug #70476 )
2015-10-18 14:48:25 -07:00
Felipe Pena
f231ddddaf
- Implemented output paging
2015-10-18 12:08:04 -02:00
Anatol Belski
daddb7a832
updated NEWS
2015-10-18 11:36:04 +02:00
Anatol Belski
dc241566aa
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2015-10-18 11:35:25 +02:00
Anatol Belski
9501293de7
update NEWS
2015-10-18 11:34:42 +02:00
Anatol Belski
af8937c056
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
C89 compat
use spprintf instead (no need to estrdup afterwards).
dblib's dbcolname can return null in some cases
testcase fot bug #69757
Segmentation fault on pdo_dblib::nextRowset (bug #69757 )
Conflicts:
ext/pdo_dblib/dblib_stmt.c
2015-10-18 11:28:57 +02:00
Anatol Belski
7f33ab834d
C89 compat
2015-10-18 11:14:30 +02:00
MiRacLe.RPZ
2b5af600e3
use spprintf instead (no need to estrdup afterwards).
2015-10-18 11:10:50 +02:00
MiRacLe.RPZ
5c19355095
dblib's dbcolname can return null in some cases
2015-10-18 11:10:45 +02:00
MiRacLe.RPZ
4c8f064d7d
testcase fot bug #69757
2015-10-18 11:10:39 +02:00
MiRacLe.RPZ
acb2368976
Segmentation fault on pdo_dblib::nextRowset (bug #69757 )
2015-10-18 11:10:34 +02:00
Aaron Piotrowski
c100a742dc
Fix missed assertion tests
2015-10-18 02:23:43 -05:00
Aaron Piotrowski
49d6336fae
Always return boolean from assert
...
Matches docs prototype
2015-10-18 01:42:15 -05:00
Aaron Piotrowski
51953423ee
Fix assert() implementation to match docs
2015-10-17 14:30:41 -05:00
Xinchen Hui
e2d6090043
Fixed bug #70730 (Incorrect ArrayObject serialization if unset is called in serialize())
...
It's possible to fixed this in SPL side, but it will be ugly, and we
should make serialize more robust, so I prefer fix it in serialize side.
2015-10-17 05:28:49 -07:00
Xinchen Hui
d4df6641c8
Fixed bug #70724 (Undefined Symbols from opcache.so on Mac OS X 10.10)
2015-10-17 01:52:32 -07:00
Felipe Pena
20a384dfa9
Fixed bug #70678 (PHP7 returns true when false is expected)
...
Cherry-pick from master.
2015-10-16 17:44:17 +02:00
Nikita Popov
e3e92e96c1
Fixed bug #70430
2015-10-15 22:14:23 +02:00
Nikita Popov
06f38d36a8
Reindent zend_yytnamerr
...
Separating this whitespace change from the next diff.
2015-10-15 22:13:14 +02:00
Xinchen Hui
88a69ffa58
Fixed bug #70715 (Segmentation fault inside soap client)
2015-10-15 18:46:57 +08:00
Sara Golemon
a2005cec5c
Scan through a range of ports in case 31338 is busy
...
ext/standard/tests/network/ud4loop.phpt hardcodes port 31338.
If that fails to bind, try a few more (up to 31499) before giving up.
2015-10-14 22:44:27 -07:00
Xinchen Hui
a2cfcdfbe9
Fixed bug #70709 (SOAP Client generates Segfault)
2015-10-15 10:19:43 +08:00
Ferenc Kovacs
b610d740fd
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
prepare for 5.6.15RC1
2015-10-15 00:54:59 +02:00
Ferenc Kovacs
22cbf68344
prepare for 5.6.15RC1
2015-10-15 00:22:12 +02:00
Bob Weinand
60b4355168
Do not create a fake Closure for real Closures
...
That is solved by just returning the Closure as is, which is safe due to Closures being immutable objects
2015-10-14 12:07:33 +02:00
Xinchen Hui
5649b0ccba
Merge branch 'patch-1' of https://github.com/glensc/php-src into PHP-7.0
2015-10-14 10:31:07 +08:00
Xinchen Hui
534856c98a
Move the tests to proper place
2015-10-14 10:26:02 +08:00
Xinchen Hui
010509355d
Fixed Conditional jump or move depends on uninitialised value
2015-10-14 10:19:57 +08:00
Bob Weinand
d398cc9d10
Prevent memcmp() result truncation
...
This fixes reported issues with sapi/phpdbg/tests/watch_001.phpt
2015-10-13 15:51:23 +02:00
Bob Weinand
6efbfc4caf
phpdbg test info_001.phpt was dependent on auto_globals_jit
2015-10-13 14:40:42 +02:00
Dmitry Stogov
d949c3b6e5
Fixed incorrect "peak" memory consumption calculation.
2015-10-13 15:20:17 +03:00
Anatol Belski
d1b67af3ab
update UPGRADING
2015-10-13 11:47:30 +02:00
Xinchen Hui
a8ae88162f
Fixed bug #70689 (Exception handler does not work as expected)
2015-10-13 17:40:58 +08:00
Bob Weinand
e85a0aba9b
Fix on/off values in phpdbg lexer
2015-10-13 11:29:51 +02:00
Anatol Belski
4d8e284cce
prepare NEWS for next
2015-10-13 10:34:30 +02:00
Anatol Belski
afdbd8f95b
update libs_versions.txt
2015-10-13 09:41:34 +02:00
Nikita Popov
7597a06562
Add more tests for closure binding
2015-10-12 20:37:14 +02:00
Dmitry Stogov
23b372d358
Forbid "fake" closure rebinding
2015-10-12 20:34:08 +02:00
Anatol Belski
dcbbf7c38d
increase API versions
2015-10-12 20:17:22 +02:00
Anatol Belski
5492fe9f25
fork test for ICU 56.1
2015-10-12 11:20:51 +02:00
Anatol Belski
aea420c7cf
fork test for ICU-56.1
2015-10-12 11:16:27 +02:00
Anatol Belski
3fb6f0014a
fix test for ICU-56.1
2015-10-12 11:10:04 +02:00
Matteo Beccati
474a2e01eb
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix test
2015-10-12 09:47:02 +02:00
Anatol Belski
d160e98feb
fix test
2015-10-12 09:46:52 +02:00
Xinchen Hui
8732ead953
Double declaration
2015-10-12 10:42:04 +08:00
Anatol Belski
4224907864
fix stack overflow
2015-10-10 18:37:16 +02:00
Bob Weinand
fe67696867
Generally run all tests in sapi folder by default
...
Turned out that sapi/phpdbg actually wasn't explicitly included as sapi folders were individually selected
2015-10-10 17:24:14 +02:00
Nikita Popov
c85ad5d0be
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
Zend/zend_closures.c
2015-10-10 15:00:41 +02:00
Nikita Popov
d7d01fc9a3
Fixed bug #70685
...
Doing a less intrusive variant of the PHP 7.0 fix for 5.6.
2015-10-10 14:59:21 +02:00
Nikita Popov
4b821f0fc6
Normalize rebinding failures
...
Move all rebinding checks into one function to make sure they stay
in sync. Normalize return value to be NULL for all rebinding
failures, instead of returning an improperly bound closure in some
cases.
2015-10-10 13:56:36 +02:00
Anatol Belski
ffb5d0aca3
Implemented file_cache_fallback mechanism
...
which is essential as an attempt to fix the "failed to reattach"
error on Windows. If file_cache is enabled, Opcache will
automaticaly switch to file_cache_only mode in the case a process
failed to map the shared segment at the required address. The
important small part of the SHM will still be mapped, which
allows information exchange between normal processes using SHM
and those using the fallback mechanism.
This is based on Dmitry's, Matt's and mine ideas. So many thanks for
support!
2015-10-09 23:47:59 +02:00
Nikita Popov
d677b25b1c
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-09 23:28:58 +02:00
Nikita Popov
e19423f3cb
Improve previous fix
...
Don't forbid null binding on plain functions.
2015-10-09 23:28:24 +02:00
Nikita Popov
f6ae19f158
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-09 23:06:32 +02:00
Nikita Popov
bbae7ddf29
Fixed bug #70681
2015-10-09 23:01:23 +02:00
Anatol Belski
be09d1c262
update NEWS
2015-10-09 12:36:40 +02:00
Anatol Belski
d468390353
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
fix coverage report for datelib
2015-10-09 12:35:48 +02:00
Anatol Belski
505c9c3742
update NEWS
2015-10-09 12:35:06 +02:00
Dmitry Stogov
0847681b1a
Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
2015-10-09 11:48:13 +03:00
Dmitry Stogov
c6af0aa33f
Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures)
2015-10-09 02:39:07 +03:00
Dmitry Stogov
93748bf9dd
Fixed infinity recurion if we create closure on top of other closure.
2015-10-09 02:37:51 +03:00
Dmitry Stogov
05bd331c6a
Fixed use after free
2015-10-09 01:09:22 +03:00
Dmitry Stogov
91fb3a7b27
Fixed bug #70674 (ReflectionFunction::getClosure() leaks memory when used for internal functions)
2015-10-09 00:45:02 +03:00
Andrea Faulds
fa23bebe94
Correct intdiv() argument names and description
2015-10-08 15:45:22 +01:00
Dmitry Stogov
3815e97136
Fixed bug #70668 (array_keys() doesn't respect references when $strict is true)
2015-10-08 14:59:02 +03:00
Dmitry Stogov
9af07e7119
Fixed bug #70667 (strtr() causes invalid writes and a crashes)
2015-10-08 14:30:43 +03:00
Nikita Popov
cc3c425af8
Fix bug #70662
...
This replaces add_new with update for the RW case. This should not
be problematic for performance, as this branch throws a notice.
Alternatively add_new could also be replaced with add. I went with
update, because it makes $a[0] += 1 behavior the same as
$a[0] = $a[0] + 1.
2015-10-08 11:03:39 +02:00
Márcio Almada
ddb6d7801e
Fix bug #70650
2015-10-07 16:25:59 +02:00
Ferenc Kovacs
f9e3461c02
pear 1.10 was released and the go-pear and install pear phars are now php7 compatible
2015-10-07 13:56:47 +02:00
Dmitry Stogov
5d2813edce
Fixed test.
...
MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes.
Probably we need to add yet another condition to also check MariaDB version.
2015-10-07 14:09:37 +03:00
Christopher Jones
19e461b07d
Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
...
* 'PHP-7.0' of https://git.php.net/repository/php-src :
Fixed test running on MarinaDB.
2015-10-07 20:27:38 +11:00
Christopher Jones
4a57f1821b
Fix mem leak and improve test portability (Senthil)
2015-10-07 20:24:49 +11:00
Dmitry Stogov
ccb677ece8
Fixed test running on MarinaDB.
2015-10-07 12:21:43 +03:00
Anatol Belski
c0ca731d7a
add comment to test
2015-10-07 09:43:28 +02:00
Dmitry Stogov
b8b335c492
Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt.
2015-10-07 04:26:26 +03:00
Dmitry Stogov
91588a98be
Fixed test (system error messages may be different).
2015-10-07 03:25:12 +03:00
Dmitry Stogov
abf3c2f796
Fixed test (it failed on 32-bit Linux and worked on 64-bit Linux just because of luck).
2015-10-07 03:08:11 +03:00
Dmitry Stogov
424a26d5d4
Split test into different versions for 32-bit and 64-bit systems
2015-10-07 01:51:37 +03:00
Dmitry Stogov
2c92f33b1d
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:php-src:
Drop HAVE_PACKED_OBJECT_VALUE
More zpp cleanup in ext/intl
2015-10-07 01:48:11 +03:00
Nikita Popov
cd2b0a7bb8
Drop HAVE_PACKED_OBJECT_VALUE
...
This check doesn't make sense anymore, we have no object_value
anymore.
2015-10-06 23:12:34 +02:00
Dmitry Stogov
e0b3b3c752
Revert "Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())"
...
This reverts commit 517b553625 .
2015-10-06 23:59:36 +03:00
Nikita Popov
0a3c1fb4c2
More zpp cleanup in ext/intl
2015-10-06 22:58:02 +02:00
Dmitry Stogov
e193d35c1e
Revert "Improve 517b55362 (scope rebinding on method Closures)"
...
This reverts commit 881c502520 .
2015-10-06 23:48:15 +03:00
Dmitry Stogov
24e88348f3
Revert "Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src "
...
This reverts commit a6be0f3fd6 .
2015-10-06 23:48:12 +03:00
Dmitry Stogov
524d00e005
Revert "Allow random $this on non-internal Closures again"
...
This reverts commit 35d0405c47 .
2015-10-06 23:48:10 +03:00
Dmitry Stogov
3c0348056a
Revert "Speed up self::method() calls (no ZEND_FETCH_CLASS)"
...
This reverts commit 8c33bdb976 .
2015-10-06 23:48:08 +03:00
Dmitry Stogov
5a49ac77aa
Revert "Speed up self::$property access by 20%"
...
This reverts commit 0fbd3e5fe7 .
2015-10-06 23:48:04 +03:00
Dmitry Stogov
1198c5d8bb
Revert "Update NEWS"
...
This reverts commit 60bb51c0d3 .
2015-10-06 23:47:49 +03:00
Sara Golemon
a2082b7c97
Add some tests for unserialize() class filtering
2015-10-06 12:04:11 -07:00
Rasmus Lerdorf
fb2c890c2c
zend.assertions is not a boolean
2015-10-06 17:13:38 +09:00
Bob Weinand
60bb51c0d3
Update NEWS
2015-10-06 01:03:04 +02:00
Scott
63617a678f
Fixed bug #70641 (Random_* - Better compatibility on Linux distros)
...
See:
* https://bugs.php.net/bug.php?id=70641
* https://github.com/php/php-src/pull/1513#issuecomment-145571829
2015-10-06 01:03:04 +02:00
Anatol Belski
d5bd999a8f
don't leak handles
2015-10-05 21:59:26 +02:00
Anatol Belski
3331d870aa
use correct function to close handles
2015-10-05 21:59:22 +02:00
Bob Weinand
0fbd3e5fe7
Speed up self::$property access by 20%
2015-10-05 21:52:09 +02:00
Bob Weinand
8c33bdb976
Speed up self::method() calls (no ZEND_FETCH_CLASS)
2015-10-05 21:16:52 +02:00
Bob Weinand
35d0405c47
Allow random $this on non-internal Closures again
...
As it turns out, there is actually no reason to prevent this, it even was a bigger BC break than expected...
Also fixes a memory leak (the Closure leaks) when calling internal functions via Closure by moving it out of leave helper onto caller side for TOP_CODE:
$z = new SplStack; $z->push(20);
$x = (new ReflectionMethod("SplStack", "pop"))->getClosure($z);
var_dump($x());
2015-10-05 17:49:32 +02:00
Bob Weinand
a6be0f3fd6
Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src
2015-10-05 14:50:04 +02:00
Bob Weinand
881c502520
Improve 517b55362 (scope rebinding on method Closures)
...
Now it is completely impossible to rebind a scoped method Closure (only the kind you get from ReflectionMethod::getClosure()) to a foreign scope
Adding a lot of tests to ensure this...
Also, properly return NULL in case the Closure could not be created instead of some crippled unbound Closure
2015-10-05 00:56:55 +02:00
Anatol Belski
a549a3ac17
improve error message
2015-10-04 16:36:53 +02:00
Anatol Belski
c97198e181
fix incrementing on 32-bit
2015-10-04 12:19:16 +02:00
Nuno Lopes
052dd3005b
fix coverage report for datelib
2015-10-04 05:45:05 -04:00
Nuno Lopes
ba4a85b012
fix coverage report for datelib
2015-10-04 05:39:01 -04:00
Xinchen Hui
2a54b02257
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-03 23:16:38 -07:00
Xinchen Hui
2fb8bb1157
Fixed bug #70632 (Third one of segfault in gc_remove_from_buffer)
2015-10-03 20:33:24 -07:00
Xinchen Hui
6876112c89
Fixed the third one of (segfault in gc_remove_from_buffer())
...
This one maybe only used in debug mode, so no bug report and no test
script provided
2015-10-03 20:15:35 -07:00
Xinchen Hui
4744eec753
Fixed bug #70631 (Another Segfault in gc_remove_from_buffer())
2015-10-03 20:08:21 -07:00
Xinchen Hui
925412ee1c
Do not edit the zval cause it might be in shared memory
2015-10-03 19:50:38 -07:00
Xinchen Hui
c147d90dbf
Fixed bug #70601 (Segfault in gc_remove_from_buffer())
2015-10-03 19:38:56 -07:00
Bob Weinand
517b553625
Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
...
This additionally removes support for binding to an unknown (not in parent hierarchy) scope.
Removing support for cross-scope is necessary for certain compile-time assumptions (like class constants) to prevent unexpected results
2015-10-04 01:38:59 +02:00
Elan Ruusamäe
62c74ac634
Update UPGRADING.INTERNALS
...
typo fix
2015-10-03 22:10:47 +03:00
Anatol Belski
4cb6342426
remove useless checks
...
Other platforms than listed in the checks are not supported since
PHP 5.5. We also won't need these checks for a while, so can simplify.
2015-10-03 10:57:32 +02:00
Anatol Belski
96fe3be7f2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix win10 support
2015-10-03 10:46:10 +02:00
Anatol Belski
83bef0ef83
fix win10 support
...
dwMajorVersion == 10 there, and generally this check is obsolete
as we don't support dwMajorVersion < 6 since 5.5
2015-10-03 10:44:43 +02:00
Nikita Popov
e892e2e253
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-03 10:13:44 +02:00
Nikita Popov
fe1933aae2
Fixed bug #70625
2015-10-03 10:12:11 +02:00
Ferenc Kovacs
b2988714aa
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Update NEWS file with LDAP fixes
2015-10-02 21:51:13 +02:00
Ferenc Kovacs
6f895a29c9
Merge branch 'pr-1544' into PHP-5.6
...
* pr-1544:
Update NEWS file with LDAP fixes
2015-10-02 21:48:33 +02:00
Derick Rethans
a2f5619303
Updated to version 2015.7 (2015g)
2015-10-02 18:12:18 +01:00
Derick Rethans
60b5487897
Empty merge
2015-10-02 18:12:18 +01:00
Derick Rethans
c08824fd72
Updated to version 2015.7 (2015g)
2015-10-02 18:12:16 +01:00
Xinchen Hui
d6c9dc719e
PHP7 is not affected
2015-10-02 07:26:04 -07:00
Xinchen Hui
83fea9461e
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/date/php_date.c
2015-10-02 07:21:07 -07:00
Xinchen Hui
c98ea8465b
Fixed bug #70619 (DateTimeImmutable segfault)
2015-10-02 07:19:21 -07:00
Bob Weinand
8285731362
Fix parse errors in -rr mode
2015-10-02 12:51:32 +02:00
Bob Weinand
4f90e2ec9d
Ensure proper set_exception_handler() handling with exit() inside it
2015-10-02 12:37:40 +02:00
Bob Weinand
0c03ba0ad0
Fixed bug #70614 (incorrect exit code in -rr mode with Exceptions)
2015-10-02 12:37:40 +02:00
Bob Weinand
32337d35cc
Do not display memory leaks on fatal
2015-10-02 12:37:40 +02:00
Bob Weinand
6c61286da4
Do not include zend_verify_return_type in executable ops (phpdbg)
2015-10-02 12:37:39 +02:00
Nikita Popov
1287c48082
Fix/improve zpp usage
...
The ext/interbase changes are done blindly, fingers crossed.
Some of these are bug fixes, some make zpp usage more idiomatic.
2015-10-02 09:35:00 +02:00
Nikita Popov
1a39b6e3c0
More check_parameters improvements
...
* Switch default REPORT_LEVEL to 1 to cut down on the noise
* Make initialization of 'C' variable always required
* Don't require init of lLdb variable if ! is used
* Don't throw error about missing init of not detected parameters
(This was a regression in the last changeset)
* Support method_parameters and throw variations
2015-10-02 09:05:39 +02:00
Nikita Popov
5c1b627458
More check_parameters improvements
...
* Allow / on everything but lLdb (on which it will work, but makes
no sense).
* For ! on lLdb add additional zend_bool* parameter.
* For optional s and p only require one of the variables to be
initialized. The length is usually not initialized.
2015-10-01 20:42:57 +02:00
Sean DuBois
06dde16a6a
Update scripts/dev/check_parameters.php for PHP 7
...
Also fix deprecation errors and move from preg_replace
-> preg_replace_callback.
2015-10-01 20:08:05 +02:00
Nikita Popov
8557e8323a
Remove checks for read_property retval being NULL
...
read_property uses &EG(uninitialized_zval) instead.
2015-10-01 16:33:30 +02:00
Nikita Popov
c25e81ab7b
Remove dead assignment in get_property_guard
2015-10-01 16:28:28 +02:00
Matteo Beccati
8039063d95
ReflectionGenerator and ReflectionType are new classes
...
I've added them to the new classes paragraph for the sake of completeness, even
though they are mentioned before as new features.
2015-09-30 15:50:01 +02:00
Antony Dovgal
99d5634079
fix dl() function
...
..which was using old macro
2015-09-30 14:40:29 +01:00
Dmitry Stogov
64a79817ce
Reordered field to improve data lacality and reduce L1D CPU cache misses in ZEND_INIT_FCALL opcode family
2015-09-30 16:22:56 +03:00
Julien Pauli
a60105d7a4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test
5.5.31 now
2015-09-30 13:19:37 +02:00
Julien Pauli
0fd71d1184
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test
5.5.31 now
Conflicts:
configure.in
main/php_version.h
2015-09-30 13:19:18 +02:00
Julien Pauli
d7fb43e30d
Fixed test
2015-09-30 13:18:16 +02:00
Julien Pauli
3f08fc0466
5.5.31 now
2015-09-30 13:01:11 +02:00
Bob Weinand
ba6d193b4c
Add NTS/ZTS information to php -v
2015-09-30 12:39:09 +02:00
Anatol Belski
3e74df74f9
fix test
2015-09-30 12:18:32 +02:00
Anatol Belski
59541795e2
fork test
2015-09-30 11:13:29 +02:00
Anatol Belski
e80306cbe8
fix tests on Windows
2015-09-30 11:13:28 +02:00
Anatol Belski
353d996c9f
tweak cgi binary search
2015-09-30 11:13:27 +02:00
Andrey Hristov
07a8e5ce37
Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now).
2015-09-30 09:03:35 +02:00
Xinchen Hui
df1a99d9a4
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-09-30 12:59:45 +08:00
Andrey Hristov
7b787ebbb6
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-30 09:04:00 +02:00
Richard Quadling
64990642cf
Spelling
...
bugger => buffer
2015-09-30 12:59:16 +08:00
Xinchen Hui
11baa1b672
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-09-30 10:41:54 +08:00
Xinchen Hui
45cb42f49f
Simply use 0/1 instead as dmitry suggested
2015-09-30 10:41:27 +08:00
Ferenc Kovacs
70e6bf03bf
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release
2015-09-30 01:35:35 +02:00
Ferenc Kovacs
0c10e10ee8
update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release
2015-09-30 01:28:39 +02:00
Ferenc Kovacs
6d9f12d0b3
add NEWS entries
2015-09-30 01:17:40 +02:00
Ferenc Kovacs
f8ec1d922e
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add NEWS entries
add NEWS entries
2015-09-30 01:17:10 +02:00
Ferenc Kovacs
264f33a23f
add NEWS entries
2015-09-30 01:16:43 +02:00
Ferenc Kovacs
62ff2d0bfe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add NEWS entries
2015-09-30 01:15:54 +02:00
Ferenc Kovacs
932f707177
add NEWS entries
2015-09-30 01:15:24 +02:00
Xinchen Hui
df2ff75116
Make ZEND_ECHO and removed ZEND_PRINT distinguishable
2015-09-29 21:50:15 +08:00
Dmitry Stogov
27d4d32e6b
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:php-src:
fix test
Ensure timeout tests wait for the entire specified duration
2015-09-29 14:11:39 +03:00
Dmitry Stogov
27a5f66da4
Added information about Zend Extension API chabges
2015-09-29 14:08:03 +03:00
Anatol Belski
bfd2637068
fix test
2015-09-29 13:04:06 +02:00
Steven Hilder
24bb5698af
Ensure timeout tests wait for the entire specified duration
2015-09-29 13:04:05 +02:00
Dmitry Stogov
ca36b7bc13
Added zend_internal_function.reserved[] fields, to allow extensions keep additional associated information.
...
We didn't have zend_internal_function.reserved[] in PHP5, but we always allocated space for zend_function union, and extensions were able to reuse zend_function.op_array.reserved[] even for internal function. Now this is not possible. And extensions have to use zend_function.op_array.reserved[] for user functions and zend_function.internal_function.reserved[] for internal.
2015-09-29 13:31:47 +03:00
Anatol Belski
5531d4492e
update NEWS for next
2015-09-29 10:51:23 +02:00
marcosptf
dae3ab8e7a
Update openssl_x509_checkpurpose.phpt
2015-09-29 10:41:24 +02:00
root
fc3580c9d5
add test to openssl ext
2015-09-29 10:41:22 +02:00
Dmitry Stogov
560e4fa393
Removed or simplified incorrect SEPARATE_*() macros usage.
2015-09-29 11:17:43 +03:00
Andrey Hristov
617bef558b
Add upgrading info about the tick functions internal API change
2015-09-29 09:48:49 +02:00
Scott
694b9af5b6
Remove makedev() check.
2015-09-29 09:14:30 +02:00
Scott
46aa628605
Different error message if makedev check fails
2015-09-29 09:14:29 +02:00
Scott
6554f721f7
Add support for getrandom(2), add type check on file descriptor
...
Fix to_read, throw exception if syscall fails
Fixes thanks to feedback from sarnold at ##crypto on freenode
Correction on error conditions
Remove dead code (thanks @defuse)
It turns out getrandom can take >256, getentropy refuses.
Better semantics
Thanks @defuse for catching my silly mistake here
Cast to size_t to be explicit
Let's simplify the logic a bit
Let's be consistent; define everything before we do any logic
Continuously check that the file descriptor is still a valid one
Add device type check on fd initialization
2015-09-29 09:14:28 +02:00
Anatol Belski
208ed0a010
fix test
...
cutting out the '/' is not critical, but allows to avoid forking
2015-09-29 09:11:52 +02:00
Stanislav Malyshev
d6e8426ebf
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Better fix for bug #70433
Conflicts:
ext/phar/dirstream.c
ext/phar/util.c
2015-09-28 21:43:16 -07:00
Stanislav Malyshev
2e267bd3c7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Better fix for bug #70433
Conflicts:
ext/phar/dirstream.c
2015-09-28 21:42:08 -07:00
Stanislav Malyshev
1ddf72180a
Better fix for bug #70433
2015-09-28 21:41:02 -07:00
Stanislav Malyshev
4c6f4863fa
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix memory leak
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
Conflicts:
ext/phar/dirstream.c
2015-09-28 20:45:02 -07:00
Stanislav Malyshev
51b23cd0f0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix memory leak
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
Conflicts:
ext/phar/dirstream.c
2015-09-28 20:44:28 -07:00
Stanislav Malyshev
f98ab19dc0
fix memory leak
2015-09-28 20:43:18 -07:00
Stanislav Malyshev
e78ac461db
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
2015-09-28 17:12:35 -07:00
Stanislav Malyshev
e7574a5329
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
Conflicts:
ext/phar/util.c
2015-09-28 17:00:32 -07:00
Stanislav Malyshev
f39a4ee0c9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
2015-09-28 16:59:46 -07:00
Stanislav Malyshev
d698f0ae51
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
2015-09-28 15:56:51 -07:00
Stanislav Malyshev
899753f240
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
2015-09-28 13:08:44 -07:00
Misha Nasledov
84452dba8e
Update NEWS file with LDAP fixes
2015-09-28 12:59:16 -07:00
Stanislav Malyshev
629e4da7cc
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
2015-09-28 11:31:14 -07:00
Andrey Hristov
be6546fac9
Add support for parameters to tick functions, on C level. This is only
...
for extensions that want to use register tick functions. Userland tick
functions are unaffected.
2015-09-28 11:21:17 +02:00
Bob Weinand
fef88b34e7
Add NEWS entry for #70533 (credits to Anatol)
2015-09-28 01:07:38 +02:00
Anatol Belski
c82e21619e
fix phpdbg's -h switch
...
The help functionality needs a correct stdout fd, so pre setup it
for the only case.
2015-09-27 15:46:07 +02:00
Andrey Hristov
7e3cd7cadf
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-25 14:29:06 +02:00
Andrey Hristov
59de2c037c
Fixed bug #70572 segfault in mysqlnd_connect
2015-09-25 14:06:28 +02:00
Andrey Hristov
85be6fe96b
Spread the news about 70384
2015-09-25 13:54:10 +02:00
Dmitry Stogov
7e797f1302
Allow an experimental VM with tail call dispatch technique (disabled by default).
...
This VM may work only if all tail calls are optimized, otherwaise it will crach because of stack overflow.
Unfortunately, we can't guarantee tail call optimization in C.
2015-09-25 12:54:51 +03:00
Anatol Belski
37c85ebb94
check for test requirement
2015-09-25 11:50:15 +02:00
Anatol Belski
c75346624a
fix data type and warning
2015-09-25 11:50:13 +02:00
Dmitry Stogov
a05fc48055
Extended zend_extension API to allow storing additional data associated with op_arrays in opcache SHM. (op_array->reserved[])
2015-09-25 11:50:38 +03:00
Dmitry Stogov
f509706318
Make necessary separation (it might be possible to fix this in a better way, but this will requre some refactoring)
2015-09-25 10:59:27 +03:00
Anatol Belski
b98d09a6a9
add note about minimum openssl version
2015-09-25 09:11:33 +02:00
Anatol Belski
67aff16d94
fix ident
2015-09-25 08:30:44 +02:00
Dmitry Stogov
c21d18ef95
Cleanup: avoid useless array duplication
2015-09-25 02:20:05 +03:00
Dmitry Stogov
01d5beddf4
Cleanup
2015-09-25 01:36:10 +03:00
Dmitry Stogov
ad4fa8f758
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-24 22:39:59 +03:00
Bob Weinand
abf6a0b376
Fix missing LOAD_OPLINE() for ZEND_USER_OPCODE_LEAVE
2015-09-24 21:06:07 +02:00
Bob Weinand
808f62bb4d
Ensure proper exception handling and EX(opline) state in USER_OPCODE handler
2015-09-24 20:33:57 +02:00
Anatol Belski
0fd7acd11d
don't keep locked mutex after errors
2015-09-24 16:34:44 +02:00
Anatol Belski
df832c966c
avoid dangling pointers
2015-09-24 16:33:58 +02:00
Anatol Belski
3ef3d80f25
move accel_shared_globals assignment into locked block
...
this might fix crashes under high concurrency
2015-09-24 16:33:57 +02:00
Anatol Belski
a7552ca310
add ovfl check, fix warnings
2015-09-24 16:33:56 +02:00
Anatol Belski
807c29ed14
fix warning
2015-09-24 16:33:54 +02:00
Anatol Belski
29bf529d88
fix warning
2015-09-24 16:33:53 +02:00
Dmitry Stogov
415000ed93
Fixed bug #70573 (Cloning SplPriorityQueue leads to memory leaks)
2015-09-24 16:42:59 +03:00
Adam Harvey
6413ecb439
Fix a memory leak in sqlite3_do_callback.
...
This was very, very obvious when using a debug build of PHP to build the
manual!
Fixes bug #70571 (Memory leak in sqlite3_do_callback).
2015-09-24 14:16:45 +02:00
Dmitry Stogov
2d55e8c186
Fix (revert) loop exit condition
2015-09-24 11:19:26 +03:00
Dmitry Stogov
262160e0e9
Attmpt to fix "Unable to reattach to base address" problem. (Matt Ficken)
2015-09-24 10:48:34 +03:00
Dmitry Stogov
92708e3e04
Cleanup: avoid reallocations
2015-09-24 02:23:09 +03:00
Dmitry Stogov
57575c0898
Cleanup: avoid reallocations
2015-09-24 01:35:16 +03:00
Dmitry Stogov
5cccd6c5b6
Fixed memory leak and avoid reallocations
2015-09-24 01:19:15 +03:00
Dmitry Stogov
51cd49b2cf
Cleanup: replace removed condition with ZEND_ASSERT()
2015-09-24 00:25:51 +03:00
Dmitry Stogov
62c96059a2
Fixed memory leak.
2015-09-23 23:16:30 +03:00
Anatol Belski
75984aef44
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
update NEWS
2015-09-23 20:01:18 +02:00
Anatol Belski
f451b023d1
update NEWS
2015-09-23 20:00:38 +02:00
Anatol Belski
a829108d5f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add test
expose openssl config path so it can be tested
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 19:57:42 +02:00
Anatol Belski
257693614e
add test
2015-09-23 19:48:38 +02:00
Anatol Belski
ca89d9a797
expose openssl config path so it can be tested
2015-09-23 19:48:20 +02:00
Andrey Hristov
3aa882ad7a
Spread the news about 70384
2015-09-23 18:38:29 +02:00
Andrey Hristov
003b764a49
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:38:29 +02:00
Bob Weinand
bccac3774b
Fixed bug #70531 (-rr should not fallback to interactive mode in phpdbg)
2015-09-23 18:30:13 +02:00
Andrey Hristov
f79cd18789
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:25:12 +02:00
Bob Weinand
4a174ca7e6
Fixed bug #70532 (respect set_exception_handler in phpdbg)
2015-09-23 17:53:29 +02:00
Anatol Belski
aba42e3dda
use bundled openssl.cnf
2015-09-23 17:14:59 +02:00
Bishop Bettini
368d3ff0d9
Bug #70561 : Fix DirectoryIterator to throw OutOfBoundsException
...
-------------------------------------------------------------------------------
DirectoryIterator implements SeekableIterator, which "should throw an
OutOfBoundsException if the position is not seekable". As is, seek just returns
and one must call valid(). This approach is different than most (all?) other
SeekableIterator implementations and leads to developer confusion. See the
bug report for a specific example.
2015-09-23 11:14:52 -04:00
Xinchen Hui
c256649d63
Fixed memleaks in apache2handler
2015-09-23 07:08:51 -07:00
Xinchen Hui
3cfff60dfe
Fixed NEWS
2015-09-23 07:05:47 -07:00
Xinchen Hui
c87ef023aa
Fixed Bug #70558 ("Couldn't fetch" error in DOMDocument::registerNodeClass())
2015-09-23 07:01:50 -07:00
Joe Watkins
1a5d6acff6
ZEND_COMPILE_GUARDS compiler option
2015-09-23 15:33:57 +02:00
Anatol Belski
77b73c8071
update NEWS
2015-09-23 15:21:27 +02:00
Dmitry Stogov
01ed736827
Don't keep dangling pointers
2015-09-23 16:16:04 +03:00
Anatol Belski
77b9acd326
add test
2015-09-23 14:17:04 +02:00
Anatol Belski
15d43095d7
expose openssl config path so it can be tested
2015-09-23 14:17:03 +02:00
Anatol Belski
2a1c06600b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
add missing header
silence mkdir to fix fails after unclean test run
2015-09-23 14:03:16 +02:00
Anatol Belski
8317e0fa46
add missing header
...
For PRIu32 and maybe more, that fixes build
2015-09-23 14:01:59 +02:00
Anatol Belski
c505d55158
silence mkdir to fix fails after unclean test run
2015-09-23 13:55:28 +02:00
Dmitry Stogov
a6509a6fdd
Fixed test
2015-09-23 13:18:30 +03:00
Xinchen Hui
1e3333e4bd
Fixed Bug #70557 (Memleak on return type verifying failed)
2015-09-23 14:10:23 +08:00
Xinchen Hui
504cd492e1
Fixed bug #70548 (Redundant information printed in case of uncaught engine exception)
2015-09-23 13:04:33 +08:00
Xinchen Hui
a9636ff5a2
Fixed bug #70555 (fun_get_arg() on unsetted vars return UNKNOW)
...
and also keep the indices of func_get_args(). since they are similar
issue of #70574 , thus reuse its test script.
2015-09-23 10:00:20 +08:00
Dmitry Stogov
d82ea930ed
Cleanup: removed deprecated commented code. Incorrect zval_dtor() usage replaced by zval_dtor_ptr().
2015-09-23 01:32:30 +03:00
Dmitry Stogov
95ac055fd3
Cleanup: zend_object_std_dtor() is called through free_obj handler
2015-09-23 00:12:31 +03:00
Dmitry Stogov
f9ec5be888
Properly cleanup on wrong ZEND_OVERLOADED_FUNCTION call
2015-09-22 23:51:30 +03:00
Dmitry Stogov
e2e99f16e1
Cleanup: removed deprecated commented code
2015-09-22 22:55:00 +03:00
Anatol Belski
afe04911a7
unmap correct handle
2015-09-22 21:20:50 +02:00
Anatol Belski
a490485893
add test
2015-09-22 20:45:52 +02:00
Anatol Belski
faa50318a3
nullify the memory chunk to avoid crashes when freeing resource
2015-09-22 20:33:46 +02:00
Anatol Belski
0e843a4582
check for NULL return
2015-09-22 20:05:12 +02:00
Dmitry Stogov
e45f67245a
Cleanup: don't keep useless dangling pointer
2015-09-22 17:48:25 +03:00
Dmitry Stogov
e050412cdd
Cleanup: removed old commented code
2015-09-22 17:06:10 +03:00
Dmitry Stogov
c72559ddf6
Cleanup: removed deprecated commented code
2015-09-22 17:02:25 +03:00
Dmitry Stogov
c49d3189b1
Cleanup: removed comments (zend_object.handle and zend_resource.handle are not going to be removed in PHP-7.0)
2015-09-22 15:56:52 +03:00
Dmitry Stogov
04bcce3c15
Cleanup (we keep and reuse size from zend_mm_huge_list)
2015-09-22 15:51:02 +03:00
Dmitry Stogov
c61604b9a9
Fixed reporting about repeatable "huge" memory leaks.
2015-09-22 15:46:41 +03:00
Dmitry Stogov
a9bbe5c384
Make use of timelib 2015.02's support for external memory managers.
2015-09-22 09:17:50 +01:00
Derick Rethans
922f325c68
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-22 09:08:47 +01:00
Derick Rethans
96d1d13d87
Update timelib to 2015.02
2015-09-22 08:59:45 +01:00
Derick Rethans
1d4f99e2b1
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
2015-09-22 08:47:15 +01:00
Derick Rethans
dfc38fd0e4
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-22 08:45:33 +01:00
Derick Rethans
e4f3fb976b
Fixed test cases due to changes in rules
2015-09-22 08:42:12 +01:00
Derick Rethans
fab5cbab1a
Bumb timelib version to 2015.01
2015-09-22 08:41:56 +01:00
Xinchen Hui
1d6228b46a
Fixed bug #70279 (HTTP Authorization Header is sometimes passed to newer reqeusts)
2015-09-22 15:28:53 +08:00
Xinchen Hui
0f3ab1c2d0
Fixed #70547 similar bug in func_get_args
2015-09-22 13:58:42 +08:00
Xinchen Hui
b8ea991821
Fixed bug #70546 (ext/sysvshm: two broken tests on Solaris) by rainer.jung
2015-09-22 12:06:09 +08:00
Xinchen Hui
e1dcfd2cf9
Fixed bug #70547 (unsetting function variables corrupts backtrace)
2015-09-22 11:59:35 +08:00
Xinchen Hui
ed5a5bdff8
Fixed bug #70544 (ext/zip/tests/oo_addglob.phpt broken on Solaris)
2015-09-21 22:04:27 +08:00
Xinchen Hui
85eece9c4f
Fixed bug #70538 ("php-fpm -i" crashes)
2015-09-21 11:18:37 +08:00
Xinchen Hui
a247c3a27d
Fixed bug #70538 ("php-fpm -i" crashes)
2015-09-21 10:55:38 +08:00
Xinchen Hui
4febfc25a6
Use die
2015-09-20 09:34:28 -07:00
Xinchen Hui
3fc5f5cdb5
Fixed bug #70535 (XSLT: free(): invalid pointer)
2015-09-20 09:30:50 -07:00
Jakub Zelenka
6a81363405
Require at least OpenSSL version 0.9.8
2015-09-20 13:01:15 +01:00
Jakub Zelenka
76783a26d2
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-20 12:38:58 +01:00
Jakub Zelenka
dcd569aad6
Use tabs for arg info indent in openssl.c
2015-09-20 12:34:35 +01:00
Xinchen Hui
b0e5f9eb6c
Unused var
2015-09-19 19:51:53 -07:00
Xinchen Hui
bb07905a4a
Fixed bug #70528 (assert() with instanceof adds apostrophes around class name)
2015-09-19 19:49:36 -07:00
Bob Weinand
509712c7d9
Add FAST_ZPP to various important stream funcs
2015-09-20 04:27:51 +02:00
Bob Weinand
c9988a1e69
Remove superfluous branches
2015-09-20 02:59:30 +02:00
Bob Weinand
95dbe1d03e
Short-circuit zend_parse_parameters_none() so that expensive zpp() call never happens in non-exceptional case
2015-09-20 02:43:22 +02:00
Bob Weinand
14af0f6dcb
Set expectations in generator handling
2015-09-20 02:19:31 +02:00
Bob Weinand
e878dff5d8
Revert accidentally committed closures.c and execute.c
2015-09-19 23:22:07 +02:00
Bob Weinand
08e253cdbc
Optimize zend_mm_small_size_to_bin()
...
It removes a cmov operation and has a much faster branch for small allocations (especially when handling strings) (<= 64 bytes)
2015-09-19 23:07:43 +02:00
Bob Weinand
b8f56013b5
Force compiler to prefer ZEND_CALL_NESTED_FUNCTION
...
It is by far the most used branch; compilers tended here to split the branches via an &2, &1 check, now it only does an &3 check and prefers ZEND_CALL_NESTED_FUNCTION branch
2015-09-19 19:49:44 +02:00
Bob Weinand
8f85dc141a
Always properly show exit status in phpdbg
...
Especially when it is only set after main run (e.g. register_shutdown_function)
2015-09-19 18:30:07 +02:00
Bob Weinand
16cde23eb2
Fix oplog...
2015-09-19 17:10:16 +02:00
Xinchen Hui
ff414555db
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-09-19 06:20:00 -07:00
Bob Weinand
491c62e2aa
Apply same fixes for until
2015-09-19 15:19:26 +02:00
Xinchen Hui
de6ee4c24f
Fixed bug #70526 (xmlrpc_set_type returns false on success)
2015-09-19 06:10:48 -07:00
Bob Weinand
8eadde40cd
Fix leave and finish
2015-09-19 14:57:36 +02:00
Yasuo Ohgaki
2f7cc862d7
Fixed bug #70529 Session read causes "String is not zero-terminated" error
2015-09-19 11:26:14 +09:00
Xinchen Hui
7680194a93
Fixed bug #70481 (Memory leak in auto_global_copy_ctor() in ZTS build)
2015-09-18 17:27:39 +08:00
Xinchen Hui
d42d0460f8
RETURN_FALSE
2015-09-18 16:33:33 +08:00
Dmitry Stogov
6a3580fd56
Use Zend MM to keep statistic of non-persistent connections (calloc/free->pecalloc/pefree)
2015-09-18 10:36:09 +03:00
Matteo Beccati
cc875d1a25
Skip session_regenerate_id_cookie.phpt when there's no cgi
2015-09-18 07:51:46 +02:00
Bob Weinand
5b8981f12e
Add eventual escaping for phpdbg arguments
2015-09-18 00:50:08 +02:00
Bob Weinand
adcabcc125
Add # delimiter to phpdbg commands
2015-09-17 22:53:10 +02:00
Dmitry Stogov
8fe171a3e0
Don't allocate memory for empty HashTables.
2015-09-17 19:17:10 +03:00
Dmitry Stogov
24fc74d412
Update information about new opcache features
2015-09-17 12:58:08 +03:00
Dmitry Stogov
41a184be10
Added information about new opcache configuration directives
2015-09-17 12:51:43 +03:00
Ferenc Kovacs
dcd3bb327f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
prepare for PHP-5.6.14RC1
2015-09-17 01:49:39 +02:00
Ferenc Kovacs
11cddaf6f4
prepare for PHP-5.6.14RC1
2015-09-17 01:48:02 +02:00
Yasuo Ohgaki
e341eb94cb
Add test for #70516 session_regenerate_id() does not send session ID cookie
2015-09-17 05:36:47 +09:00
Anatol Belski
0c7872f88a
add range check
2015-09-16 15:39:21 +02:00
Remi Collet
286b157a5f
fix regressio introduce in 22e23e7cb8
2015-09-16 14:32:05 +02:00
Sebastian Bergmann
486848168c
Fugbix typo
2015-09-15 08:58:50 -07:00
Xinchen Hui
066c05e51f
Suppressed warning about this function is not used
2015-09-15 08:54:14 -07:00
Xinchen Hui
a261938d50
Add Note about huge_code_pages
2015-09-15 08:28:32 -07:00
Xinchen Hui
517c59bfcb
Suppressed warning -Wvolatile-register-var
2015-09-15 08:23:21 -07:00
Xinchen Hui
e841016df7
Upgrade unicode_data.h to UnicodeData.txt 8.0.0 (part of bug #70475 ext/mbstring/unicode_data.h needs update)
2015-09-15 07:56:10 -07:00
Anatol Belski
fff3c1d368
prepare NEWS for RC4
2015-09-15 12:42:39 +02:00
Anatol Belski
5e5a0295c7
add missing NEWS entry
2015-09-15 08:17:25 +02:00
Christopher Jones
e0193a0bef
Improve row fetch changes for PHP7. Update test SKIPIFs. Add test for 11g client (Senthil)
2015-09-15 12:03:24 +10:00
Dmitry Stogov
233c42ad59
Enabled placing PHP code segment into huge pages
2015-09-15 02:04:09 +03:00
Dmitry Stogov
818e5ea5f7
Enable file based cache compilation by default
2015-09-15 01:58:32 +03:00
Dmitry Stogov
c104d329e1
Use shorter php.ini directive name "opcache.huge_code_pages" and disable it by default.
2015-09-15 01:54:04 +03:00
Dmitry Stogov
f2480582fb
Removed useless include
2015-09-15 01:46:53 +03:00
Dmitry Stogov
927d68db24
Avoid reallocations
2015-09-14 23:04:27 +03:00
Dmitry Stogov
5c28c21159
Use memcpy() instead of mmap() to keep modifyed code (e.g. gdb breakpoints)
2015-09-14 18:42:45 +03:00
Nikita Popov
ab74d80247
Fix bug #70487
...
Switch to * instead of + in zpp.
2015-09-14 15:04:43 +02:00
Dmitry Stogov
669f0b39b1
Added an experemental ability to move PHP code pages (PHP TEXT segment) into HUGE pages.
...
PHP should be configured and built with --enable-huge-code-pages, OS should be configured to provide huge pages.
It's possible to enable/disable this future in php.ini through opcache.enable_huge_code_pages=0/1.
The feature was tested on Linux and provided 2% improvement on real-life apps, because of 2-3 times reduction in number of iTLB misses.
2015-09-14 13:34:17 +03:00
Christopher Jones
145708b658
Fix mem leak in PHP7
2015-09-14 13:29:09 +10:00
Christopher Jones
3c2d6f7f40
Merge branch 'master' of https://git.php.net/repository/php-src
2015-09-14 12:52:40 +10:00
Bob Weinand
fe08b933e4
Add support for **= in opcache optimizer
2015-09-13 12:35:35 +02:00
Anatol Belski
969dcf7b61
add overflow check
2015-09-12 18:57:23 +02:00
Anatol Belski
5d035b57ee
fix data types
2015-09-12 18:53:30 +02:00
Anatol Belski
c6ff5be09d
add range checks
2015-09-12 10:29:00 +02:00
Christopher Jones
a96f99e30a
Final diff fixes for PHP7 on base platform (some mem leaks still to be fixed). Update driver name. Improve test portability (Senthil)
2015-09-12 09:10:32 +10:00
Christopher Jones
4ee6a9a9a9
Merge branch 'master' of https://git.php.net/repository/php-src
2015-09-12 09:05:41 +10:00
Bob Weinand
b0174a14c0
Fixed bug #70478 (**= does no longer work)
...
Reordered ZEND_(ASSIGN_)POW opcodes in zend_vm_def.h so that it won't be missed in future
2015-09-12 00:54:48 +02:00
Christopher Jones
8c63d69aa9
Merge branch 'master' of https://git.php.net/repository/php-src
2015-09-12 08:51:24 +10:00
Dmitry Stogov
51aa1b5a1d
Manual CSE to avoid double read
2015-09-11 14:13:41 +03:00
Xinchen Hui
465d0326d1
Change this as sixd suggested
2015-09-11 15:05:56 +08:00
Xinchen Hui
874dc06156
Merge branch 'PHP-5.6'
2015-09-11 13:52:00 +08:00
Xinchen Hui
37d814b84c
Add test XFAIL for bug #70470
2015-09-11 13:45:18 +08:00
Xinchen Hui
4ddeeb49a5
Remove free_string_zval
2015-09-11 10:58:24 +08:00
Dmitry Stogov
719664dec2
fixed compilation error
2015-09-10 20:24:11 +03:00
Dmitry Stogov
1b8bf059c4
Don't keep dangling pointer.
2015-09-10 20:03:42 +03:00
Xinchen Hui
97b85364a5
Fixed Sixd :<
2015-09-10 20:14:22 +08:00
Xinchen Hui
bb4c0c0703
Merge branch 'PHP-5.6'
2015-09-10 19:56:18 +08:00
Xinchen Hui
a8368ddc38
Fixed bug #70431 (Memory leak in php_ini.c)
2015-09-10 19:56:13 +08:00
Xinchen Hui
66643f6192
Use efree_size
2015-09-10 16:22:07 +08:00
Xinchen Hui
213b49620d
Simplfy zend_is_true
2015-09-10 16:13:22 +08:00
Xinchen Hui
f3e8675d38
Added folder marks
2015-09-10 15:01:28 +08:00
Xinchen Hui
7a0e68b97c
Unexpected
2015-09-10 14:57:22 +08:00
Xinchen Hui
6852f9cd43
cleanup tmp_member handling
2015-09-10 14:39:25 +08:00
Dmitry Stogov
27f6b8864e
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Aligned IntlChar protos to their ARG_INFO (related to #70453 )
Skip IntlChar related test if ext/intl is not available
2015-09-10 02:53:57 +03:00
Dmitry Stogov
c174e4cd73
Change array sorting implementation to avoid two level callbacks system.
...
Simplify zval comparion API.
2015-09-10 02:51:23 +03:00
Christoph M. Becker
46c20ecf0a
Aligned IntlChar protos to their ARG_INFO (related to #70453 )
2015-09-10 01:38:15 +02:00
Christoph M. Becker
31962306f4
Skip IntlChar related test if ext/intl is not available
2015-09-10 01:31:55 +02:00
Côme Bernigaud
059dd18c37
Added support of LDAP_OPT_TIMEOUT, fixes #69574
2015-09-09 18:02:10 +02:00
Dmitry Stogov
2ea18cd431
Better array_compare improvement
2015-09-09 15:11:03 +03:00
Lior Kaplan
e0f390cb72
Add entry for #70284 in 7.0.0RC2
2015-09-09 14:22:46 +03:00
Lior Kaplan
43f6099ce4
Add entry for #70284 in 5.6.13
2015-09-09 14:20:04 +03:00
Dmitry Stogov
ac83eaef10
Don't inline "slow" and rarely used functions.
2015-09-09 13:42:35 +03:00
Xinchen Hui
6d885e395c
Merge branch 'master' of git.php.net:/php-src
2015-09-09 18:02:27 +08:00
Xinchen Hui
59e8eae4b0
Useless ZVAL_UNDEF
2015-09-09 18:00:04 +08:00
Xinchen Hui
67d1a47887
Improved array_compare
2015-09-09 17:56:44 +08:00
Côme Bernigaud
fb9d934d51
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 11:05:29 +02:00
Dmitry Stogov
b1be126788
Avoid useless EG(exception) checks
2015-09-09 11:54:44 +03:00
Côme Bernigaud
a483a79c85
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:34:46 +02:00
Côme Bernigaud
cc7140e8d9
Merge branch 'pull-request/1512' into PHP-5.5
...
* pull-request/1512:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:30:17 +02:00
Xinchen Hui
b00a315806
Unused var
2015-09-09 15:15:43 +08:00
Xinchen Hui
98bf9156d5
unused var
2015-09-09 15:11:42 +08:00
Christoph M. Becker
502b70c50c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Skip test for old glibc iconv
2015-09-09 04:33:28 +02:00
Christoph M. Becker
71da4f1f7f
Skip test for old glibc iconv
...
bug32001.phpt has a high failure rate for the submitted reports. According to
several samples it seems the iconv implementation of glibc 2.12 (released
2010-05) is the culprit. It seems appropriate to skip the test for such old
versions.
2015-09-09 04:27:28 +02:00
Nikita Popov
7c8798834a
Small cleanup in pack() implementation
2015-09-09 03:58:37 +02:00
Tyson Andre
c3fc65eb7c
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
...
LDAP_OPT_TIMELIMIT and LDAP_OPT_DEREF's original values weren't
saved properly because of a bug introduced when copy and pasting.
This lead to the original timeout being changed
when specifying a temporary override (e.g. for ldap_search(..., $timeout))
2015-09-08 18:42:02 -07:00
Christoph M. Becker
6886bb688b
updated NEWS
2015-09-09 03:21:17 +02:00
Christoph M. Becker
71f90dfbad
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70456 : mysqlnd doesn't activate TCP keep-alive when connecting to a server
Resolved conflicts:
ext/mysqlnd/mysqlnd_net.c
2015-09-09 03:19:55 +02:00
Christoph M. Becker
b89f128480
updated NEWS
2015-09-09 03:12:59 +02:00
Dmitry Stogov
c7dffb5673
Don't inline "Undefined variable" warning reporting.
2015-09-09 03:18:52 +03:00
Sergei Turchanov
7b3616db77
Fix #70456 : mysqlnd doesn't activate TCP keep-alive when connecting to a server
...
libmysqlclient activates TCP keep-alive when connecting to a server. PHP
mysqlnd extension must do the same to maintain compatibility.
2015-09-09 01:43:29 +02:00
Bob Weinand
c12917aa45
Merged RFC Random Functions Throwing Exceptions in PHP 7
...
Squashes commits from PR #1397
commit cd5dcc8c9eb43603d908abcea69c9e18df0f2ed5
Author: SammyK <sammyk@sammykmedia.com >
Date: Tue Sep 8 13:53:42 2015 -0500
Add min max samezies
commit b719499218a4e84efecd4dc1d4235d16142c9793
Author: SammyK <sammyk@sammykmedia.com >
Date: Wed Sep 2 07:00:25 2015 -0500
Make random_bytes() throw Error when $length <= 0 and random_int() throw Error when $min > $max
commit 0cca557291c278716ec4b00b32fc2bdc1c1c8848
Author: SammyK <sammyk@sammykmedia.com >
Date: Wed Sep 2 06:55:59 2015 -0500
Make random_*() functions throw Error exception when random bytes cannot be obtained
commit 998c7f1e209123605b41139e8d9093075ce16bd6
Author: SammyK <sammyk@sammykmedia.com >
Date: Wed Sep 2 06:41:20 2015 -0500
Make random_*() functions throw TypeError when zend_parse_parameters fails
commit 99d305c18820ff55d82d952777cbcdf1cf0158be
Author: SammyK <sammyk@sammykmedia.com >
Date: Mon Jul 6 19:50:47 2015 -0500
Make exceptions less specific
commit b042dfab290713366741a663a420cf12bf802f39
Author: SammyK <sammyk@sammykmedia.com >
Date: Mon Jul 6 17:20:13 2015 -0500
Upgrade warnings to RuntimeExceptions
2015-09-09 01:00:29 +02:00
Dmitry Stogov
aa3fd8c849
Fixed typo that might cause serious bugs in MM. May be it was the reason of bug #70392 (SIGSEGV during PHP shutdown).
2015-09-08 17:22:26 +03:00
Dmitry Stogov
bfab74d574
Check EG(exception) only if it's really necessary
2015-09-08 17:20:52 +03:00
Yasuo Ohgaki
3bf9bd5e92
Fix typo in comment.
2015-09-08 18:52:31 +09:00
Yasuo Ohgaki
f4c9deb452
Add URL rewrite issue note.
2015-09-08 18:50:40 +09:00
Yasuo Ohgaki
ab0e347f26
Add more test cases
2015-09-08 18:44:23 +09:00
Christoph M. Becker
07c7b33028
updated NEWS
2015-09-07 23:48:14 +02:00
Christoph M. Becker
1c902e2e63
Fix #70454 : IntlChar::forDigit second parameter should be optional
...
ZPP expects "ll" instead of "l|l" what would match the "proto" and the
ARG_INFO.
2015-09-07 23:46:12 +02:00
Christoph M. Becker
34c1755842
updated NEWS
2015-09-07 23:06:13 +02:00
Christoph M. Becker
1372909429
Fix #70453 : IntlChar::foldCase() incorrect arguments and missing constants
...
We add missing ARG_INFO for the seconds parameter $options, and add the
respective constants IntlChar::FOLD_CASE_DEFAULT and
::FOLD_CASE_EXCLUDE_SPECIAL_I.
2015-09-07 23:02:56 +02:00
Anatol Belski
f402056194
update NEWS
2015-09-07 17:35:57 +02:00
Anatol Belski
b9155b851e
add test for bug #70423
2015-09-07 17:31:49 +02:00
Bob Weinand
51272f4217
Fixed bug #70449 (PHP won't compile on 10.4 and 10.5 because of missing constants)
2015-09-07 17:28:29 +02:00
Anatol Belski
585d8642b5
update NEWS
2015-09-07 17:09:19 +02:00
Anatol Belski
46792a9914
remove unnecessary check
...
as it's unrelated to the size pre calculation
2015-09-07 15:14:26 +02:00
Anatol Belski
eaf96698c7
Fix bug #70423 Warning Internal error: wrong size calculation
2015-09-07 15:02:33 +02:00
Remi Collet
db99b877f0
ext/zip version is now 1.13.0
2015-09-07 14:04:20 +02:00
Remi Collet
a5d6cf788e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix build
2015-09-07 13:55:19 +02:00
Remi Collet
debfc866d2
Fix build
...
php_zip.c:1647:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
php_zip.c:1648:3: error: format not a string literal and no format arguments [-Werror=format-security]
2015-09-07 13:52:28 +02:00
Yasuo Ohgaki
aa352a34fd
Make sure closing save handler.
2015-09-07 04:55:08 +09:00
Yasuo Ohgaki
f34b858ed0
Fix #70013 : Reference to $_SESSION is lost after a call to session_regenerate_id()
2015-09-07 03:57:03 +09:00
Jakub Zelenka
22e23e7cb8
Update NEWS for OpenSSL
2015-09-06 19:13:41 +01:00
Jakub Zelenka
e235cb65fb
Fix request #70438 : Add IV parameter for openssl_seal and openssl_open
2015-09-06 19:09:56 +01:00
Jakub Zelenka
a49d394beb
Fix OpenSSL record in NEWS file
2015-09-06 16:51:06 +01:00
Jakub Zelenka
473ccf47a5
Merge branch 'PHP-5.6'
2015-09-06 16:42:37 +01:00
Jakub Zelenka
d47029167d
Fix bug #60632 : openssl_seal fails with AES
2015-09-06 16:39:59 +01:00
Christoph M. Becker
9773864661
updated NEWS
2015-09-06 15:37:35 +02:00
Christoph M. Becker
1b344f55f4
Revert "Fix #70029 : nodeValue of DOMElement list content of children nodes"
...
This reverts commit 25a52d98d7 .
2015-09-06 15:36:43 +02:00
Christoph M. Becker
892a745ef1
updated NEWS
2015-09-05 14:51:25 +02:00
Christoph M. Becker
cc9da62bdb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #68291 : 404 on urls with '+'
Resolved conflicts:
sapi/cli/php_cli_server.c
2015-09-05 14:43:19 +02:00
Christoph M. Becker
aed225b7e4
updated NEWS
2015-09-05 14:39:24 +02:00
Christoph M. Becker
fd94c92171
Fix #68291 : 404 on urls with '+'
...
URI paths have to be treated according to RFC 3986 by the CLI web server, not
as application/x-www-form-urlencoded.
2015-09-05 14:34:08 +02:00
Christoph M. Becker
403974f4dc
updated NEWS
2015-09-05 03:22:45 +02:00
Christoph M. Becker
28e82cc714
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70395 : Missing ARG_INFO for openssl_seal()
2015-09-05 03:19:43 +02:00
Christoph M. Becker
f9ece83994
updated NEWS
2015-09-05 03:14:56 +02:00
Christoph M. Becker
43b26c7b21
Fix #70395 : Missing ARG_INFO for openssl_seal()
...
This patch adds the missing ARG_INFO for the optional 5th parameter $method.
2015-09-05 03:08:02 +02:00
Christoph M. Becker
8355dfc41a
updated NEWS and UPGRADING
2015-09-05 02:03:23 +02:00
Christoph M. Becker
25a52d98d7
Fix #70029 : nodeValue of DOMElement list content of children nodes
...
According to the W3C DOM Core Level 3 specification DOMElement::nodeValue is
supposed to yield null, but currently the DOM extension yield the result of
calling xmlNodeGetContent(), what is the concatenation of the values of the
children of the element. This patch fixes the non standard behavior.
2015-09-05 01:52:41 +02:00
Christoph M. Becker
3be54e12d5
updated NEWS
2015-09-05 01:35:16 +02:00
Christoph M. Becker
c9a8733ce2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70001 : Assigning to DOMNode::textContent does additional entity encoding
Resolved conflicts:
ext/dom/node.c
2015-09-05 01:32:08 +02:00
Christoph M. Becker
dc1a8dd7f0
updated NEWS
2015-09-05 01:27:59 +02:00
Christoph M. Becker
b2954c64ab
Fix #70001 : Assigning to DOMNode::textContent does additional entity encoding
...
Assigning to DOMNode::textContent encodes entities, what does not match the
behavior of DOMText::__construct() and DOMDocument::createTextNode. This patch
changes the behavior of DOMNode::textContent in this regard.
2015-09-05 01:17:50 +02:00
Christoph M. Becker
320e891f5b
updated NEWS
2015-09-05 00:47:09 +02:00
Christoph M. Becker
0836d6484c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70322 : ZipArchive::close() doesn't indicate errors
2015-09-05 00:43:41 +02:00
Christoph M. Becker
b59ea797f5
updated NEWS
2015-09-05 00:37:08 +02:00
Christoph M. Becker
c77f783777
Fix #70322 : ZipArchive::close() doesn't indicate errors
...
If an archive can't be written, ZipArchive::close() nonetheless returns TRUE.
We fix the return value to properly return success, and additionally raise a
warning on failure.
2015-09-05 00:34:10 +02:00
Jakub Zelenka
539db00538
Simplify JSON constants registration
2015-09-04 20:00:29 +01:00
Jakub Zelenka
6e5574807f
Add my name to authors for previous refactoring
...
Related to jsond changes
2015-09-04 19:56:59 +01:00
Jakub Zelenka
7fe2646be3
Move json_decode options macros bellow encode options
2015-09-04 19:37:12 +01:00
Ryan McCullagh
45fdff1c85
json: fix formating of PHP_JSON* option bitshifts
2015-09-04 19:29:54 +01:00
Kalle Sommer Nielsen
fbfceaaa5d
Merge branch 'pull-request/1497'
2015-09-04 17:59:06 +02:00
Kalle Sommer Nielsen
4481be5d26
Fix build on Windows
2015-09-04 17:49:48 +02:00
Bob Weinand
3d05785054
Merge remote-tracking branch 'origin/PHP-5.6'
2015-09-04 16:35:15 +02:00
Niklas Keller
4b1dff6f43
Fix #70361 : HTTP stream wrapper doesn't close keep-alive connections
2015-09-04 16:29:35 +02:00
Márcio Almada
c08b3922dd
adds missing tokens to list of semi-reserved words and regenerates test suite
2015-09-04 15:02:50 +02:00
Joe Watkins
26e619b192
these need to be exported for extensions that use json
2015-09-03 19:28:34 +01:00
Anatol Belski
0f74baed9c
prepare NEWS for next
2015-09-03 19:04:39 +02:00
Lior Kaplan
3bb88aee53
Align NEWS entries format
2015-09-03 19:49:07 +03:00
Lior Kaplan
dbbc0e4ced
Align NEWS entries format
2015-09-03 19:46:41 +03:00
Anatol Belski
fcece2a7bb
sync NEWS
2015-09-03 18:25:14 +02:00
Lior Kaplan
9131cf4924
Add missing variable from birdstep_commit() which got removed in e8fcd52ef
2015-09-03 18:46:07 +03:00
Lior Kaplan
23b88d38e8
Align NEWS entries format
2015-09-03 17:53:53 +03:00
Lior Kaplan
abf0ede0ac
Add CVE for #70140 (PHP 7.0.0 Beta 3)
2015-09-03 17:51:07 +03:00
Xinchen Hui
49ee37d870
Seems master is not affected
2015-09-02 23:15:57 -07:00
Xinchen Hui
d5b78cec64
We should keep one refcount to resource
2015-09-02 22:14:48 -07:00
Xinchen Hui
6815c08e29
Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
2015-09-02 22:07:29 -07:00
Xinchen Hui
6290344d96
Fixed test
2015-09-02 21:59:36 -07:00
Levi Morrison
432dc527ad
Partially fix bug #67167 - Wrong return value...
...
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE
The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.
2015-09-02 18:23:26 -06:00
Ferenc Kovacs
4388eba510
Merge branch 'PHP-5.6'
...
* PHP-5.6:
move the phpdbg NEWS entry to the correct version
2015-09-03 01:58:29 +02:00
Ferenc Kovacs
52b2a3ff25
move the phpdbg NEWS entry to the correct version
2015-09-03 01:58:13 +02:00
Ferenc Kovacs
ece397ef0f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add missing news entries
2015-09-03 01:47:17 +02:00
Ferenc Kovacs
3759de241f
add missing news entries
2015-09-03 01:46:38 +02:00
Levi Morrison
730496b899
Skip if ext/filter isn't loaded
2015-09-02 10:12:08 -06:00
Julien Pauli
1f0045d44a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Merge branch 'PHP-5.6'
bump version
2015-09-02 17:56:49 +02:00
Julien Pauli
c65350cd4d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Merge branch 'PHP-5.6'
bump version
2015-09-02 17:55:57 +02:00
Julien Pauli
bb98ed600a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Merge branch 'PHP-5.6'
bump version
Conflicts:
configure.in
main/php_version.h
2015-09-02 17:55:20 +02:00
Matteo Beccati
a12cef979d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added missing skipif for phar+zlib test
2015-09-02 17:53:36 +02:00
Julien Pauli
60e2207c34
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.5.30 next
More fixes for bug #70219
Conflicts:
ext/pcre/php_pcre.c
ext/session/session.c
2015-09-02 17:51:02 +02:00
Julien Pauli
c07150cd1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.30 next
Conflicts:
configure.in
main/php_version.h
2015-09-02 17:42:00 +02:00
Julien Pauli
ea807f9c07
5.5.30 next
2015-09-02 17:40:56 +02:00
Xinchen Hui
7cf8df5597
Merge branch 'master' of git.php.net:/php-src
2015-09-02 23:36:43 +08:00
Xinchen Hui
1cfd12d618
Use ZSTR_VAL
2015-09-02 23:36:13 +08:00
Xinchen Hui
362f787b75
Merge branch 'fix-dtrace-phpdbg' of https://github.com/reeze/php-src
2015-09-02 23:28:51 +08:00
Anatol Belski
ebb6f5eae6
fix dir separators in test
2015-09-02 17:26:35 +02:00
Anatol Belski
2d72a17ab9
use correct api
2015-09-02 17:25:00 +02:00
Anatol Belski
45a72785b5
fix leak
2015-09-02 17:20:24 +02:00
Anatol Belski
59d3529f29
cleanup an atavism
...
no DOS support here )
2015-09-02 17:05:47 +02:00
Anatol Belski
9d82a7dc98
add overflow check
2015-09-02 17:05:45 +02:00
Anatol Belski
95ac779956
remove unnecessary macros
2015-09-02 17:05:43 +02:00
Dmitry Stogov
6848cb3f63
Use regular huge pages instead of anonymous if available.
2015-09-02 15:55:41 +03:00
Dmitry Stogov
111bd5d8c4
Introduced additional check. Its miss might be the reason of bug #70392 (SIGSEGV during PHP shutdown)
2015-09-02 13:05:12 +03:00
Dmitry Stogov
a2f8a7675b
Prevent HashTable compaction below HT_MIN_SIZE (this may lead to hash collisions).
2015-09-02 13:03:31 +03:00
Stanislav Malyshev
9c35f87e9a
Temporary add XFAILs, will fix soon
2015-09-02 01:23:40 -07:00
Stanislav Malyshev
6640aded24
fix memory leak
2015-09-02 01:21:47 -07:00
Stanislav Malyshev
c18f662e3c
Merge remote-tracking branch 'origin/master'
...
* origin/master:
Add test for ReflectionMethod::getPrototype_basic()
Added two tests to check the main functionallity of recode extension
Doubles are not refcounted
Fix #32490 : constructor of mysqli has wrong name
2015-09-02 01:00:16 -07:00
Stanislav Malyshev
9b1a224d4e
Merge branch 'PHP-5.6'
...
* PHP-5.6: (21 commits)
fix unit tests
update NEWS
add NEWS for fixes
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
...
Conflicts:
ext/exif/exif.c
ext/gmp/gmp.c
ext/pcre/php_pcre.c
ext/session/session.c
ext/session/tests/session_decode_variation3.phpt
ext/soap/soap.c
ext/spl/spl_observer.c
ext/standard/var.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/xsl/xsltprocessor.c
2015-09-02 00:37:20 -07:00
Davey Shafik
9ec6a44c5e
Add CURLPIPE_* constants to properly expose HTTP/2 multiplexing
2015-09-02 17:16:43 +12:00
marcosptf
519016096f
Add test for ReflectionMethod::getPrototype_basic()
2015-09-02 00:28:46 +02:00
Daniel Persson
c98b88aafe
Added two tests to check the main functionallity of recode extension
2015-09-02 00:11:45 +02:00
Hannes Magnusson
874dcd8f73
Doubles are not refcounted
2015-09-01 14:52:04 -07:00
Stanislav Malyshev
51fca4b77d
bump version
2015-09-01 13:12:16 -07:00
Stanislav Malyshev
a6c063d663
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
More fixes for bug #70219
2015-09-01 12:51:48 -07:00
Christoph M. Becker
b15eff6386
Fix #32490 : constructor of mysqli has wrong name
...
As of PHP 7 old style constructor names are deprecated, so we rename
mysqli::mysqli() to mysqli::__construct().
2015-09-01 21:44:16 +02:00
Stanislav Malyshev
3fe509443c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix unit tests
2015-09-01 12:24:14 -07:00
Stanislav Malyshev
43c2dfa7b3
Merge branch 'PHP-5.5' into PHP-5.5.29
...
* PHP-5.5:
fix unit tests
2015-09-01 12:24:06 -07:00
Stanislav Malyshev
4aeff30337
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix unit tests
2015-09-01 12:23:55 -07:00
Stanislav Malyshev
1922c650ba
fix unit tests
2015-09-01 12:23:22 -07:00
Stanislav Malyshev
c19d59c550
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
add NEWS for fixes
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
5.4.45 next
Conflicts:
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/zip/php_zip.c
2015-09-01 12:06:41 -07:00
Stanislav Malyshev
45e7e79485
Merge branch '70284' into PHP-5.6
...
* 70284:
Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
2015-09-01 12:05:02 -07:00
Stanislav Malyshev
32fe02c27d
Merge branch 'PHP-5.5' into PHP-5.5.29
...
* PHP-5.5:
update NEWS
add NEWS for fixes
2015-09-01 12:04:04 -07:00
Stanislav Malyshev
31b634bf7c
update NEWS
2015-09-01 12:03:48 -07:00
Stanislav Malyshev
0fac73a3bf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add NEWS for fixes
2015-09-01 12:00:30 -07:00
Stanislav Malyshev
7ceb0e3a18
add NEWS for fixes
2015-09-01 11:53:59 -07:00
Stanislav Malyshev
53d274beb0
Merge branch 'PHP-5.5' into PHP-5.5.29
...
* PHP-5.5:
Improve fix for #70172
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
Conflicts:
ext/pcre/php_pcre.c
2015-09-01 11:43:27 -07:00
Stanislav Malyshev
33d3acaae7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
5.4.45 next
Conflicts:
configure.in
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_version.h
2015-09-01 11:42:19 -07:00
Stanislav Malyshev
48cfd1160b
Merge branch 'PHP-5.4.45' into PHP-5.4
...
* PHP-5.4.45:
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix for bug #69782
2015-09-01 11:40:15 -07:00
Stanislav Malyshev
7c31203935
Improve fix for #70172
2015-09-01 11:38:39 -07:00
Bob Weinand
50d6fd6a03
Fixed bug #70397 (Segmentation fault when using Closure::call and yield)
2015-09-01 18:04:19 +02:00
Joe Watkins
a8a3b02fd9
fix for --enable-zend-signals and ZTS
...
temporary fix to make queue size bigger in zend_signal while I work on it
2015-09-01 16:51:40 +01:00
Joe Watkins
ccba374faf
Merge branch 'master' of https://github.com/php/php-src
2015-09-01 11:00:45 +01:00
Dmitry Stogov
d8eee72a84
Fixed possible caching with invalid key value
2015-09-01 12:56:33 +03:00
Joe Watkins
85a511d2c1
fix zend signal and tsrm compat
2015-09-01 09:34:54 +01:00
Stanislav Malyshev
e2291e4b1a
Merge branch 'PHP-5.4.45' into PHP-5.5.29
...
* PHP-5.4.45:
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
2015-09-01 01:17:12 -07:00
Stanislav Malyshev
1390a5812b
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
2015-09-01 01:16:30 -07:00
Stanislav Malyshev
3605d1baf5
Merge branch 'PHP-5.4.45' into PHP-5.5.29
...
* PHP-5.4.45:
fix test
2015-09-01 00:59:55 -07:00
Stanislav Malyshev
906f19f136
fix test
2015-09-01 00:59:31 -07:00
Dmitry Stogov
bb4b50636c
Fixed one more problem related to bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
2015-09-01 10:39:00 +03:00
Stanislav Malyshev
6935058a98
Merge branch 'PHP-5.4.45' into PHP-5.5.29
...
* PHP-5.4.45:
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Conflicts:
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
2015-09-01 00:28:39 -07:00
Stanislav Malyshev
c8f07ad477
add test
2015-09-01 00:26:12 -07:00
Stanislav Malyshev
259057b2a4
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
2015-09-01 00:20:45 -07:00
Stanislav Malyshev
f06a069c46
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
2015-09-01 00:14:15 -07:00
Stanislav Malyshev
e8429400d4
Fix bug #70172 - Use After Free Vulnerability in unserialize()
2015-08-31 23:26:14 -07:00
Stanislav Malyshev
e201f01ac1
Fix bug #70388 - SOAP serialize_function_call() type confusion
2015-08-31 21:06:03 -07:00
Dmitry Stogov
66770f9c37
Added missing set of fcc->initialized flag.
2015-09-01 03:15:50 +03:00
Bob Weinand
84b608de10
Fix valgrind warning upon displaying lines from eval()ed code in phpdbg
2015-08-31 23:42:15 +02:00
Dmitry Stogov
89aa1b7392
Ensure proper data alignment
2015-08-31 13:56:42 +03:00
Dmitry Stogov
37f0c6b5cb
Add myself into list of authors of the most refactored files.
2015-08-31 11:38:16 +03:00
Bob Weinand
54a831829a
Respect exit status for -rr option with phpdbg
2015-08-30 20:25:10 +02:00
Xinchen Hui
5f006ade64
Merge branch 'patch-8' of https://github.com/ovr/php-src
2015-08-30 08:02:17 -07:00
Xinchen Hui
a68e577b4e
Merge branch 'master' of https://github.com/softwarespot/php-src
2015-08-30 08:00:15 -07:00
Xinchen Hui
871545fdd0
Merge branch 'PHP-5.6'
2015-08-30 05:34:31 -07:00
Xinchen Hui
9da99d8c5f
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-08-30 05:34:15 -07:00
Xinchen Hui
014abbc840
Merge branch 'PHP-5.6'
...
Conflicts:
ext/pdo/pdo_dbh.c
ext/pdo/php_pdo_driver.h
2015-08-30 05:32:37 -07:00
Xinchen Hui
ef1bd8f0e6
Fixed bug #70389 (PDO constructor changes unrelated variables)
2015-08-30 05:02:38 -07:00
Stanislav Malyshev
f9c2bf73ad
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
2015-08-30 00:38:08 -07:00
Stanislav Malyshev
ce2c67c8e8
Improve fix for #70385
2015-08-29 23:01:36 -07:00
Anatol Belski
d7cd2d7bd6
fix possible overflow
2015-08-29 20:14:07 +02:00
Anatol Belski
0245d6c6a3
use non deprecated symbols
2015-08-29 20:12:31 +02:00
Matteo Beccati
cb5582d3c1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added missing skipif for phar+zlib test
2015-08-29 10:48:53 +02:00
Matteo Beccati
9d816f1bcf
Added missing skipif for phar+zlib test
2015-08-29 10:47:02 +02:00
Matteo Beccati
6b3e44369d
Fixed bug #70386 Can't compile on NetBSD because of missing WCONTINUED
...
since 90114a3e93
2015-08-29 08:07:45 +02:00
Stanislav Malyshev
03964892c0
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
2015-08-28 22:52:50 -07:00
Stanislav Malyshev
64043cb9e5
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
2015-08-28 22:25:41 -07:00
Stanislav Malyshev
fc8eff897b
More fixes for bug #70219
2015-08-28 21:50:21 -07:00
Nikita Popov
ccec609b82
Fix bug #62441
...
These checks were introduced by 8646d9afce
back when name resolution was working differently.
2015-08-28 19:00:05 +02:00
Nikita Popov
7f2261d24a
Fix HT_ASSERT ht->nInternalPointer checks
...
The & was on the wrong side...
2015-08-28 18:59:46 +02:00
Dmitry Stogov
127db5a37d
HANDLE_BLOCK_INTERRUPTIONS() is not used by SAPIs anymore. It may be useful only when PHP configured with --enable-zend-signals.
2015-08-28 16:10:07 +03:00
Anatol Belski
7e3fb94461
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix dir separator in test
fix path separator in test
fix test
2015-08-28 14:49:14 +02:00
Dmitry Stogov
8da0aeaa13
Removed signal protection (set to NULL before free() to avoid dangling pointers)
2015-08-28 15:32:50 +03:00
Dmitry Stogov
87f0f77105
Simplified integer overflow checks
2015-08-28 12:47:21 +03:00
Anatol Belski
00eebd7a47
fix dir separator in test
2015-08-28 11:39:26 +02:00
Dmitry Stogov
5d15d2b26d
Removed useless signal protection
2015-08-28 12:39:18 +03:00
Anatol Belski
5d2294e8b8
fix path separator in test
2015-08-28 11:38:16 +02:00
Anatol Belski
ebdd9cf6e8
fix test
2015-08-28 11:29:38 +02:00
Adam Harvey
de63ebf5f4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix NEWS indentation.
Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
2015-08-27 16:01:33 -07:00
Adam Harvey
4ddc4af87c
Fix NEWS indentation.
2015-08-27 16:00:36 -07:00
Adam Harvey
e872f4d9c1
Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
...
Fixes bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when building
extensions).
2015-08-27 15:59:59 -07:00
Jakub Zelenka
0a3f2caa6c
Remove merged bug #55259 info from PHP 7 NEWS
2015-08-27 21:44:38 +01:00
Jakub Zelenka
e4f9354615
Merge branch 'PHP-5.6'
2015-08-27 21:43:57 +01:00
Jakub Zelenka
a5864d9917
Update NEWS with info about bug #55259
2015-08-27 21:37:59 +01:00
Dmitry Stogov
745753eacb
Prevent double load on fast path (manual common subexpression elimination)
2015-08-27 23:02:15 +03:00
Jakub Zelenka
6b9f31ab74
Merge branch 'PHP-5.6'
2015-08-27 20:17:33 +01:00
Xinchen Hui
859712a89c
remove redundant ;
2015-08-27 13:05:41 +08:00
Xinchen Hui
aa24209855
Enable format checking for strpprintf
2015-08-27 11:42:50 +08:00
Xinchen Hui
c359ca8c3d
Fixed printing
2015-08-27 11:38:11 +08:00
softwarespot
76a0cbc0c2
Removed trailing whitespace
2015-08-26 22:24:46 +03:00
Anatol Belski
b795ce6de5
make overflow checks as unexpected
...
it's supposed to mark an error case
2015-08-26 21:12:41 +02:00
Jakub Zelenka
ad028ebc11
Use new range checks in openssl ext
2015-08-26 19:55:29 +01:00
Dmitry Stogov
e549ebdb23
Mark parse error functions as cold
2015-08-26 18:29:42 +03:00
Dmitry Stogov
942747cc3e
Removed unused functions
2015-08-26 18:29:23 +03:00
Anatol Belski
95073c8429
fix year in the header
2015-08-26 17:10:23 +02:00
Anatol Belski
150dead2d9
add range check to ext/soap
2015-08-26 16:39:54 +02:00
Anatol Belski
1553ce2093
add some range checks to pcre
2015-08-26 16:39:53 +02:00
Anatol Belski
ce3e3f7884
more range checks in ext/tidy
2015-08-26 16:39:52 +02:00
Anatol Belski
871acceace
add range checks to ext/tidy
2015-08-26 16:39:51 +02:00
Anatol Belski
201afce875
add some range checks to ext/dom
2015-08-26 16:39:50 +02:00
Anatol Belski
a3dceb485a
fix test
2015-08-26 16:39:48 +02:00
Anatol Belski
2c523f21c9
add range checks to simplexml
2015-08-26 16:39:47 +02:00
Anatol Belski
d40a149ade
fix typo
2015-08-26 16:39:46 +02:00
Anatol Belski
c867b510df
include range checks with the portability header
2015-08-26 16:39:45 +02:00
Anatol Belski
e2ce37be6a
added basic stuff with the zend_range_check.h
2015-08-26 16:39:44 +02:00
Dmitry Stogov
1f0f768e3f
Avoid duplication
2015-08-26 14:53:41 +03:00
Christopher Jones
22ad36428a
Merge branch 'master' of https://git.php.net/repository/php-src
2015-08-26 21:24:05 +10:00
Christopher Jones
a52902faf4
Squash some more PHP 7 diffs and improve test portability (Senthil)
2015-08-26 21:22:58 +10:00
Stanislav Malyshev
24dda816d0
Merge branch 'PHP-5.4.45' into PHP-5.5.29
...
* PHP-5.4.45:
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix for bug #69782
5.4.45 next
Conflicts:
configure.in
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_version.h
2015-08-25 23:08:49 -07:00
Niklas Keller
91712c35f8
Fix Typos: exteption -> exception
2015-08-26 07:30:56 +02:00
Christopher Jones
371eba811f
Merge branch 'master' of https://git.php.net/repository/php-src
2015-08-26 14:35:41 +10:00
Dmitry Stogov
25f9e25526
Fixed bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
2015-08-26 03:27:05 +03:00
Bob Weinand
c1e9bd27fe
Fix zend_vm_call_opcode_handler (e.g. Generators throwing exceptions) with IP/FP registers
2015-08-26 00:25:25 +01:00
Dmitry Stogov
9d31b29705
Avoid array duplication
2015-08-25 22:40:33 +03:00
Jakub Zelenka
c39336d1d8
Fix bug #55259 (openssl extension does not get the DH parameters from DH key resource)
2015-08-25 20:26:11 +01:00
Christoph M. Becker
2455ab2a2b
Remove superfluous forward declaration
...
mysqli_get_cache_stats() has been removed with commit f9ad56e; we're finally
getting rid of its remaining forward declaration.
2015-08-25 14:26:55 +02:00
Anatol Belski
7366e29662
fix build, use exported symbol
2015-08-25 10:39:43 +02:00
Dmitry Patsura
2391ec73c1
TravisCI - remove unneded code
2015-08-25 12:33:15 +08:00
Dmitry Stogov
2482325b3d
Assign CPU registers for GOTO and SWITCH executor as well
2015-08-25 02:38:06 +03:00
Christoph M. Becker
a8d38674b1
updated NEWS
2015-08-24 23:16:21 +02:00
Christoph M. Becker
405f8b5c91
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #67131 : setcookie() conditional for empty values not met
Resolved conflicts:
ext/standard/head.c
2015-08-24 23:11:03 +02:00
Christoph M. Becker
e5adf2b427
updated NEWS
2015-08-24 23:05:18 +02:00
Christoph M. Becker
fc203fa37e
Fix #67131 : setcookie() conditional for empty values not met
...
PHP applies a workaround for old MSIE where setting an empty cookie value would
not delete the cookie. This workaround is only triggered if an empty string (or
a value that converts to an empty string) is actually given as $value parameter
of setcookie. If the $value parameter is omitted, an empty cookie value is
sent. This commit fixes the inconsistent behavior.
2015-08-24 23:03:50 +02:00
Dmitry Stogov
f9f568aa1e
In 95% cases we initialize "empty" array (with 8 hash slots).
2015-08-24 22:07:28 +03:00
Dmitry Stogov
96ea4a0ac6
Mark error functions as "cold"
2015-08-24 18:07:59 +03:00
Ferenc Kovacs
95a0b11d0a
fixup, both catched by nikic
2015-08-24 17:02:25 +02:00
Xinchen Hui
fd5e0dc3c6
Fixed bug #70342 (changing configuration with ignore_user_abort(true) isn't working)
2015-08-24 21:09:16 +08:00
Ferenc Kovacs
e93d7953df
use another character device in this test as /dev/console seems that it is different for lxc containers
2015-08-24 14:40:21 +02:00
Ferenc Kovacs
941bbf2067
the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
2015-08-24 14:40:06 +02:00
Bob Weinand
6b3228fda4
Fix oplog with eval()ed code
2015-08-24 12:28:35 +01:00
Dmitry Stogov
db5898c9e5
Optimize fast path
2015-08-24 12:47:06 +03:00
Stanislav Malyshev
df4bf28f9f
Fix bug #70219 (Use after free vulnerability in session deserializer)
2015-08-23 19:56:12 -07:00
Stanislav Malyshev
d735957cb5
Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
2015-08-23 16:08:07 -07:00
Anatol Belski
b928ea2de7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix test
fix test
fix test
fix test
2015-08-23 22:56:51 +02:00
Ferenc Kovacs
85d34c3264
let's try running our testsuite without sudo
2015-08-23 22:47:51 +02:00
marcosptf
d536ecac5c
added test for gzgetss()
2015-08-23 17:55:23 +02:00
Anatol Belski
78b2b1d6f7
fix test
...
backport from master
2015-08-23 17:27:55 +02:00
Anatol Belski
b460b530d6
fix test
...
backport from master
2015-08-23 17:27:53 +02:00
Anatol Belski
24e78ec1d8
fix test
2015-08-23 17:27:51 +02:00
Anatol Belski
5786f86656
fix test
...
backported from master
2015-08-23 17:27:50 +02:00
Xinchen Hui
c68fa93de5
Merge branch 'master' of git.php.net:php-src
2015-08-23 20:42:10 +08:00
Xinchen Hui
f56534e4b9
Fixed Bug #70332 (Wrong behavior while returning reference on object)
...
This fix is actually made for array acessing bug fix (#70262 ) which is
discarded since we have another better fix, anyway now seems this is still useful
2015-08-23 20:17:51 +08:00
Bob Weinand
45ae47a149
Merge remote-tracking branch 'origin/PHP-5.6'
2015-08-23 12:19:31 +01:00
Bob Weinand
272cccd175
Fix phpdbg_break_next()
2015-08-23 12:07:14 +01:00
Bob Weinand
e9f21a3388
Fix phpdbg_break_next() and add test
2015-08-23 11:58:45 +01:00
Xinchen Hui
4df6f26442
Fixed bug #70330 (Segmentation Fault with multiple "curl_copy_handle")
2015-08-23 13:01:47 +08:00
Xinchen Hui
55f88141c5
Re-Fixed bug #70321 (Magic getter breaks reference to array property)
2015-08-23 11:42:33 +08:00
Xinchen Hui
e26a04f9ec
Revert "Fixed bug #70321 (Magic getter breaks reference to array property)"
...
This reverts commit 66754585f8 .
2015-08-23 10:40:28 +08:00
Bob Weinand
66754585f8
Fixed bug #70321 (Magic getter breaks reference to array property)
...
Note that the UNEXPECTED(zv) was turned into EXPECTED(zv), as zv is mostly set in the context where it is used and usually anyway is checked first with OP*_TYPE == IS_VAR; or maybe just completely remove that (UN)EXPECTED at this place...
2015-08-22 23:54:59 +01:00
Bob Weinand
76e3e99dd6
Fix issues with phpdbg SIGINT handler
...
Also fix valgrind warnings in allocator when not using mmap()ed memory
2015-08-21 23:36:31 +01:00
Anatol Belski
f9ae74a4c0
make this test Windows only
...
as we're not in control of the libxml builds everywhere
2015-08-21 19:47:17 +02:00
Anatol Belski
ac2f6ddd4f
here string isn't supported by every shell
2015-08-21 19:11:53 +02:00
Ferenc Kovacs
5ed1b70841
$() isn't supported on every shell
2015-08-21 18:27:03 +02:00
Anatol Belski
83a055c3da
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix tests
fix dir separator
fix dir separator in test
fix dir separator in test
2015-08-21 15:48:03 +02:00
Anatol Belski
2b9c7f881a
fix tests
2015-08-21 15:13:39 +02:00
Anatol Belski
aa23bc6d1d
fix dir separator
2015-08-21 14:08:33 +02:00
Anatol Belski
9e69ef4ce2
fix dir separator in test
2015-08-21 14:05:58 +02:00
Anatol Belski
e8f37fe3dc
fix dir separator in test
2015-08-21 14:04:08 +02:00
Xinchen Hui
5a37056efa
unnecessary 1 byte allocted
2015-08-21 18:28:02 +08:00
Anatol Belski
13044447eb
add test for bug 70309
2015-08-21 11:47:00 +02:00
Anatol Belski
03f6ffd1d7
note to UPGRADING
2015-08-21 10:48:25 +02:00
Bob Weinand
823062d6c1
Fix invalid range error by gawk in order_by_dek.awk
2015-08-21 00:13:03 +02:00
Bob Weinand
82b73fd1e3
Remove assumption that extensions are in ext/ext-name
...
Fixes also a weird ln (symlink) hack for phpdbg
2015-08-21 00:13:02 +02:00
Sara Golemon
a3eed5fbfe
Move __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defs earlier
...
These defines should apply to windows as well,
so move them out of the non-windows specific section
and always define them for C++ compilations.
2015-08-20 14:40:08 -07:00
Bob Weinand
5ece3ec71c
Fix bogus traces with ReflectionGenerator::getTrace()
2015-08-20 23:24:28 +02:00
Sara Golemon
29a8981c81
Enable definitions of stdint.h limits/constants used by Zend/zend_long.h
...
Define __STDC_LIMITS_MACROS and __STDC_CONSTANT_MACROS
prior to including stdint.h for the first time so that it
defines the INT64_MAX / INT64_C / etc... macros we use elsewhere
when building for C++ (C already gets these).
2015-08-20 11:34:44 -07:00
Jakub Zelenka
7ad1703413
Add overflow check for openssl_pkcs12_read
2015-08-20 19:29:54 +01:00
Anatol Belski
ef063dcb05
one new line too much
2015-08-20 13:32:30 +02:00
Anatol Belski
4ad0714d76
fork test
2015-08-20 13:32:29 +02:00
Nikita Popov
ef7d822c32
Remove path from test
2015-08-20 12:58:36 +02:00
Nikita Popov
186b0f3770
Don't allow leading \ in group use decl list
...
We recently added support for "use \Foo\{Bar}". This commit drops
support for the reverse "use Foo\{\Bar}". Those two got mixed up
in the initial implementation.
2015-08-20 11:47:43 +02:00
Ferenc Kovacs
4d7a8f119e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.6.14 next
2015-08-20 09:57:49 +02:00
Ferenc Kovacs
c7c9858ba1
5.6.14 next
2015-08-20 09:56:47 +02:00
Christopher Jones
af76506830
Fixed bug #70308 (PDO::ATTR_PREFETCH is ignored)
2015-08-20 14:09:30 +10:00
Christopher Jones
f8ee809e22
Merge branch 'master' of https://git.php.net/repository/php-src
2015-08-20 13:57:39 +10:00
Christoph M. Becker
7373da78fe
Merge branch 'pull-request/1471'
...
* pull-request/1471:
add test for php_enchant_broker_free()
2015-08-19 22:27:39 +02:00
marcosptf
bf340ec417
add test for php_enchant_broker_free()
2015-08-19 22:25:29 +02:00
Christoph M. Becker
8e9e1b7da3
Merge branch 'pull-request/1472'
...
* pull-request/1472:
This is a new test for enchant_broker_free_dict(). This function never was covered by .phpt
2015-08-19 22:16:42 +02:00
marcosptf
d085100a52
This is a new test for enchant_broker_free_dict().
...
This function never was covered by .phpt
2015-08-19 22:15:40 +02:00
Christoph M. Becker
533c11386f
Merge branch 'pull-request/1475'
...
* pull-request/1475:
testing enchant_broker_(g|s)et_dict_path
2015-08-19 21:59:40 +02:00
marcosptf
9a4b0dbe40
testing enchant_broker_(g|s)et_dict_path
2015-08-19 21:57:42 +02:00
Jakub Zelenka
c3f0c87564
Add overflow checks for openssl_pkey_* functions
2015-08-19 20:10:14 +01:00
Jakub Zelenka
478ecc674b
Move overflow checks in openssl_pbkdf2
2015-08-19 20:06:58 +01:00
Anatol Belski
09970d8031
Revert "fix occasional fail in zip_close when target arc exists"
...
This reverts commit ed78d59a1d .
2015-08-19 19:00:53 +02:00
Anatol Belski
e6aa1fb249
fix config.w32 to include suitable lib files
2015-08-19 19:00:51 +02:00
Dmitry Stogov
30dcb2d662
Fixed typo
2015-08-19 19:15:30 +03:00
Christoph M. Becker
569023cde6
updated NEWS
2015-08-19 16:35:17 +02:00
Christoph M. Becker
361fb5baaa
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70303 : Incorrect constructor reflection for ArrayObject
2015-08-19 16:33:40 +02:00
Christoph M. Becker
6c99cb2929
updated NEWS
2015-08-19 16:25:59 +02:00
Christoph M. Becker
484b92919b
Fix #70303 : Incorrect constructor reflection for ArrayObject
...
The first parameter of ArrayObject::__construct() is optional. Reflection
should reflect this.
2015-08-19 16:23:16 +02:00
Anatol Belski
026b41ba66
improve error message
2015-08-19 15:23:23 +02:00
Anatol Belski
ed78d59a1d
fix occasional fail in zip_close when target arc exists
2015-08-19 15:23:21 +02:00
Dmitry Stogov
c97427ea8e
Fixed typo in proper place
2015-08-19 15:45:39 +03:00
Dmitry Stogov
3350faf7e4
Fixed typo
2015-08-19 15:15:17 +03:00
Dmitry Stogov
71af54e5f6
Mark error and exception functions as "cold" (Matt's idea)
2015-08-19 14:40:56 +03:00
Xinchen Hui
066f6f6ad8
Merge branch 'PHP-5.6'
2015-08-19 18:41:46 +08:00
Xinchen Hui
b584b51398
Fixed bug #70290 (Null pointer deref (segfault) in spl_autoload via ob_start)
2015-08-19 18:41:28 +08:00
Dmitry Stogov
9b1570a378
Removed deprecated comments and added expectations (overloaded properties and array elements are less frequently used than regular ones)
2015-08-19 12:21:14 +03:00
Anatol Belski
1bb5479d06
update NEWS
2015-08-19 11:07:40 +02:00
Anatol Belski
0562ec85df
Fix bug #70145 From field incorrectly parsed from headers
2015-08-19 11:05:35 +02:00
Anatol Belski
7f4ae19c80
added /guard:cf to release builds
2015-08-19 10:56:43 +02:00
Anatol Belski
3708d9c1b4
use the bare tarball filename for the stub, no path elements
2015-08-19 10:51:15 +02:00
Xinchen Hui
a44abef8b2
Update NEWs
2015-08-19 16:34:26 +08:00
Xinchen Hui
574e8966a4
Merge branch 'master' of https://github.com/marcioAlmada/php-src
2015-08-19 16:30:28 +08:00
Xinchen Hui
c89bd3f3c3
This bug is already fixed, but it's better to have a bug entry for the record
2015-08-19 10:47:08 +08:00
Christopher Jones
9047b567e3
Resolve build warnings. Bump ver. Better range check. Fix diffs
2015-08-19 10:42:53 +10:00
Bob Weinand
4df77a6c58
Fixed bug #70295 (Segmentation fault with setrawcookie)
2015-08-19 01:33:19 +02:00
Márcio Almada
7568d5cb89
fixes a syntactical inconsistency with group use and leading \
...
discussion: http://news.php.net/php.internals/87774
2015-08-18 19:23:58 -03:00
Anatol Belski
32462a8076
correct NEWS
2015-08-18 23:27:49 +02:00
Christoph M. Becker
3d8214a021
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #67604 : The built windows documention refers to nonexistent dll
2015-08-18 21:26:09 +02:00
Christoph M. Becker
c12aa3c7ce
Fix #67604 : The built windows documention refers to nonexistent dll
...
Since quite a while the Windows builds ship with php5apache2_4.dll, but not
with other server modules. We fix some out-dated info in install.txt.
2015-08-18 21:21:28 +02:00
Jakub Zelenka
6a201b3651
Use macros for openssl overflow checks
...
It reduces code duplications
2015-08-18 20:17:04 +01:00
Jakub Zelenka
618c327a56
Fix possible overflow in openssl_pbkdf2
...
Especially key_length would lead to the crash if it overflowed
to the negative value.
2015-08-18 19:46:59 +01:00
Anatol Belski
000be61fb8
NEWS for next
2015-08-18 20:31:37 +02:00
Joe Watkins
784dd715e4
Fix mangled property names on anon classes
2015-08-18 16:37:38 +01:00
Côme Bernigaud
8acda9cad5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Patch from Rainer Jung to provide Solaris LDAP support
Conflicts:
ext/ldap/ldap.c
2015-08-18 17:26:46 +02:00
Côme Bernigaud
54bd91175d
Merge branch 'pull-request/1477' into PHP-5.6
...
* pull-request/1477:
Patch from Rainer Jung to provide Solaris LDAP support
2015-08-18 17:17:28 +02:00
Côme Bernigaud
40befb943c
Patch from Rainer Jung to provide Solaris LDAP support
2015-08-18 16:52:44 +02:00
Xinchen Hui
af8b6ac310
Merge branch 'patch-gdbinit' of https://github.com/adsr/php-src
2015-08-18 22:51:09 +08:00
Xinchen Hui
3ea8c3cf1c
Fixed memleak in Zend/tests/bug39297
2015-08-18 21:46:02 +08:00
Xinchen Hui
e543769fa4
Fixed bug #70288 (Apache crash related to ZEND_SEND_REF)
2015-08-18 21:45:19 +08:00
Bob Weinand
34834c58fa
Fixed bug #70293 (Crash with specific assertions and zend.assertions=-1)
2015-08-18 15:01:24 +02:00
Julien Pauli
9a138b47c9
Removed unused code
2015-08-18 14:33:04 +02:00
Bob Weinand
a1c9c318ea
Woops, accidentally made TS build fail...
2015-08-18 14:04:48 +02:00
Bob Weinand
501407aa49
Revert fix for nicer truncation on log_errors_max_len
2015-08-18 14:01:18 +02:00
Christoph M. Becker
1b5e87a579
Fix #70289 : Different sort in php7 (and hhvm) compared to php5
...
We add a respective note to UPGRADING. Furthermore, as renaming of zend_qsort()
and the new zend_insert_sort() are irrelevant for user-land, we move this
info to UPGRADING.INTERNALS.
2015-08-18 13:44:14 +02:00
Xinchen Hui
22eaa995ee
Lost this entry while merging
2015-08-18 19:12:52 +08:00
Xinchen Hui
75198c7371
Merge branch 'master' of git.php.net:php-src
2015-08-18 19:07:26 +08:00
Bob Weinand
c83cbdf6ce
Better fix for exception traces truncation with anon classes
2015-08-18 12:48:06 +02:00
Xinchen Hui
dca6d1027a
Fixed bug #70272 (Segfault in pdo_mysql)
2015-08-18 18:33:07 +08:00
Xinchen Hui
8df3461086
Improved fix for bug #70262
2015-08-18 18:07:31 +08:00
Xinchen Hui
cf9cdf97db
Merge branch 'master' of git.php.net:php-src
2015-08-18 18:07:25 +08:00
Xinchen Hui
14ea398d78
It should not be skip
2015-08-18 18:04:26 +08:00
Xinchen Hui
685fee75a5
Skip the test with valgrind
2015-08-18 18:03:34 +08:00
Dmitry Stogov
d9a9b8572b
Revert "Do not truncate exception traces upon anon class name"
...
This reverts commit b0c77fb80c .
2015-08-18 12:03:04 +03:00
Michael Wallner
17fc5cc65d
fix inheritance of internal interfaces with constants
2015-08-18 08:20:12 +02:00
Michael Wallner
e6e5defb31
fix printzv (refcount)
2015-08-18 08:20:12 +02:00
Bob Weinand
b0c77fb80c
Do not truncate exception traces upon anon class name
2015-08-18 03:27:56 +02:00
Anatol Belski
c042c64c43
fix test
...
This fail has nothing together with any changes in run-tests.php
Using run-tests.php from the 5.5 branch brings the same result. So
merely it is about how PHP7 handles and buffers errors.
2015-08-17 23:12:50 +02:00
Anatol Belski
94e272f1b3
TSRM_TLS should be usable in NTS build
2015-08-17 23:12:49 +02:00
Christoph M. Becker
d28abb2da2
no need to skip this test if no dictionaries are installed
2015-08-17 21:43:28 +02:00
Christoph M. Becker
c3a303d431
Merge branch 'pull-request/1473'
...
* pull-request/1473:
new test for enchant pwl file
2015-08-17 21:42:42 +02:00
marcosptf
3b004baaaa
new test for enchant pwl file
2015-08-17 21:28:37 +02:00
Jakub Zelenka
c4a98e876c
Check and use correct signature_len type for EVP_VerifyFinal
2015-08-17 18:43:02 +01:00
Christoph M. Becker
b28758f253
updated NEWS
2015-08-17 19:35:10 +02:00
Christoph M. Becker
07c1b641b5
fixed changed error message in test
2015-08-17 19:33:49 +02:00
Christoph M. Becker
61591ea636
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70277 : new DateTimeZone($foo) is ignoring text after null byte
Resolved conflicts:
ext/date/php_date.c
2015-08-17 19:28:46 +02:00
Christoph M. Becker
3ed58fb5d7
updated NEWS
2015-08-17 17:27:13 +02:00
Julien Pauli
aae9004ebd
Removed dead code
2015-08-17 17:18:25 +02:00
Julien Pauli
5f54027d04
Renamed struct member
...
<resolv.h> has a #define for _res which makes compilation
fail if included before php_output.h
2015-08-17 16:25:03 +02:00
Christoph M. Becker
bb057498f7
Fix #70277 : new DateTimeZone($foo) is ignoring text after null byte
...
The DateTimeZone constructors are not binary safe. They're parsing the timezone
as string, but discard the length when calling timezone_initialize(). This
patch adds a tz_len parameter and a respective check to timezone_initialize().
2015-08-17 15:58:37 +02:00
Dmitry Stogov
ce89fd9758
Fixed bug #70262 (Accessing array crashes PHP 7.0beta3)
2015-08-17 12:58:14 +03:00
Dmitry Stogov
2d475eb943
Fixed tests on 32-bit systems
2015-08-17 12:54:33 +03:00
Stanislav Malyshev
1744be2d17
Fix for bug #69782
2015-08-16 17:16:15 -07:00
Derick Rethans
9a895396c9
Merge branch 'PHP-5.6'
2015-08-16 21:27:50 +01:00
Derick Rethans
b010a9d846
Fixed sorting order
...
It needs to match the strcasecmp in parse_tz.c.
2015-08-16 21:27:07 +01:00
Derick Rethans
cdaf057adb
Updated to version 2015.6 (2015f)
2015-08-16 21:26:12 +01:00
Derick Rethans
8811847b24
Empty merge
2015-08-16 21:26:12 +01:00
Derick Rethans
7cafffc31f
Updated to version 2015.6 (2015f)
2015-08-16 21:26:11 +01:00
Jakub Zelenka
f3abea9f91
Fix some int overflows in openssl
...
There might be more. I just did a quick check for enc/dec, rand
and one BN call.
2015-08-16 15:43:00 +01:00
Anatol Belski
1613359543
update NEWS
2015-08-15 17:29:58 +02:00
Anatol Belski
46101dbec5
fix incompatible types
...
namely between hash_data_type and st_data_t
2015-08-15 12:03:47 +02:00
Anatol Belski
3689b44453
add SIZEOF_SIZE_T to oniguruma
2015-08-15 11:39:06 +02:00
Anatol Belski
228eaf5bc4
fix pointer truncation cases
2015-08-15 11:27:07 +02:00
Tjerk Meesters
0bd7d7a369
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS for #70157
Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 16:49:30 +08:00
Tjerk Meesters
b0c5439b5f
Updated NEWS for #70157
2015-08-15 15:13:01 +08:00
Tjerk Meesters
71daca28d4
Merge branch 'bug70157' into PHP-5.6
...
* bug70157:
Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 15:11:31 +08:00
Tjerk Meesters
0d7159d26d
Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 15:10:34 +08:00
Christoph M. Becker
c63b505573
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed wrong params in proto
2015-08-15 02:27:09 +02:00
Christoph M. Becker
a4e0539188
fixed wrong params in proto
2015-08-15 02:23:56 +02:00
Adam Saponara
d27a8a7dcb
Prevent warning when printing arrays in gdb
2015-08-14 14:22:55 -04:00
Christoph M. Becker
243b9f6592
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src :
Executed file can be NULL
2015-08-14 17:21:09 +02:00
Christoph M. Becker
e13de24101
updated NEWS
2015-08-14 17:19:29 +02:00
Christoph M. Becker
fc444896af
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70264 : CLI server directory traversal
2015-08-14 17:18:35 +02:00
Nikita Popov
6366679906
Executed file can be NULL
...
So revert this part to what it was originally.
2015-08-14 17:16:45 +02:00
Christoph M. Becker
23d0b93893
updated NEWS
2015-08-14 17:11:33 +02:00
Christoph M. Becker
9c805a6cb3
Fix #70264 : CLI server directory traversal
...
On Windows the built-in webserver doesn't prevent directory traversal when
backslashes are used as path component separators. Even though that is not a
security issue (the CLI webserver is meant for testing only), we fix that by
replacing backslashes in the path with slashes on Windows, because backslashes
may be valid characters for file names on other systems, but not on Windows.
2015-08-14 17:05:31 +02:00
Nikita Popov
2af19fb50a
Fix leak in previous commit
...
Turns out zend_update_property_str already does the copy implicitly.
2015-08-14 17:04:33 +02:00
Nikita Popov
13567d5dee
Don't copy zend_strings during exception creation
...
Minor optimization...
2015-08-14 16:16:27 +02:00
Anatol Belski
38c19d43c1
fix array size calculation for range, related to bug #70239
2015-08-14 14:34:48 +02:00
Anatol Belski
86984d7ade
add range() tests
2015-08-14 14:34:48 +02:00
Anatol Belski
01ee09f3f7
Fixed bug #70239 Creating a huge array doesn't result in exhausted, but segfault
2015-08-14 14:34:47 +02:00
Christoph M. Becker
ad27aded5c
updated NEWS
2015-08-14 14:32:56 +02:00
Christoph M. Becker
5e93fe3c57
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
2015-08-14 14:25:19 +02:00
Christoph M. Becker
0e51f9798c
updated NEWS
2015-08-14 14:20:37 +02:00
Christoph M. Becker
e66bf11638
Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
...
The required_num_args argument of ZEND_BEGIN_ARG_INFO_EX() has to be 1.
2015-08-14 14:19:12 +02:00
Xinchen Hui
a094f4faed
Remove useless insert
2015-08-14 17:09:27 +08:00
Xinchen Hui
97433d8f6e
Fixed dumpbt
2015-08-14 16:20:53 +08:00
Dmitry Stogov
57a8620761
Set expectations
2015-08-14 10:59:39 +03:00
Adam Harvey
d6db83816c
We don't need CVS/SVN keywords in UPGRADING.
2015-08-13 12:40:46 -07:00
Adam Harvey
edafed6b68
We did eventually decide it was PHP 7.0, so make it so.
2015-08-13 12:39:41 -07:00
Christoph M. Becker
f9744a36a2
Merge branch 'pull-request/1454'
...
* pull-request/1454:
Docs for find_tested.php
2015-08-13 20:33:59 +02:00
Xinchen Hui
66866fb838
Simplify the macro (HT_DATA_SIZE/HT_HASH_SIZE is not used outside Zend)
2015-08-13 23:38:39 +08:00
Xinchen Hui
cf12da4f33
Fixed similar issues(segfault on OOM)
2015-08-13 23:02:51 +08:00
Xinchen Hui
ded3a44cfd
Fixed segfault while OOM in pack_to_hash
2015-08-13 22:42:18 +08:00
Xinchen Hui
69dbfa8e9f
Fixed tests(I am not sure, these tests seems strange, anyway it passes
...
locally now)
2015-08-13 22:31:59 +08:00
Christoph M. Becker
896cb51499
updated NEWS
2015-08-13 14:30:05 +02:00
Christoph M. Becker
1ec40e84d4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70232 : Incorrect bump-along behavior with \K and empty string match
Resolved conflicts:
ext/pcre/php_pcre.c
2015-08-13 14:28:16 +02:00
Christoph M. Becker
cd18ba117c
updated NEWS
2015-08-13 14:21:17 +02:00
Christoph M. Becker
b9f23c2152
Fix #70232 : Incorrect bump-along behavior with \K and empty string match
...
To do global matching (/g), for every empty match we have to do a second match
with PCRE_NOTEMPTY turned on. That may fail, however, when the \K escape
sequence is involved. For this purpose libpcre 8.0 introduced the
PCRE_NOTEMPTY_ATSTART flag, which we will use if available, and otherwise fall
back to the old (possibly buggy) behavior.
2015-08-13 14:20:04 +02:00
Dmitry Stogov
715d5d2855
Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h.
...
This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
2015-08-13 13:56:29 +03:00
Derick Rethans
e5813fedf8
Merge branch 'PHP-5.6'
2015-08-13 11:07:39 +01:00
Derick Rethans
f94bcb1026
Of course, we support v2 in PHP 5.6 as well.
2015-08-13 11:07:16 +01:00
Derick Rethans
159bc6ecdc
Updated to version 2015.6 (2015f)
2015-08-13 10:54:06 +01:00
Derick Rethans
a49ddcff67
Empty merge
2015-08-13 10:54:05 +01:00
Derick Rethans
890204fa45
Updated to version 2015.6 (2015f)
2015-08-13 10:54:03 +01:00
Derick Rethans
3ddd826684
Tell timelib we support v2
2015-08-13 10:50:28 +01:00
Xinchen Hui
18f2505830
Add entry for zend_memnstr change
2015-08-13 13:39:31 +08:00
Xinchen Hui
793d8dcffd
Merge branch 'master' of git.php.net:php-src
2015-08-13 13:30:50 +08:00
Xinchen Hui
dc5c6ab774
Fixed bug #70250 (extract() turns array elements to references)
2015-08-13 13:30:25 +08:00
Christopher Jones
4672aac0a7
Merge branch 'PHP-5.6'
2015-08-13 15:01:24 +10:00
Christopher Jones
5cfbfbc73c
PDO_OCI is not experimental
2015-08-13 15:01:01 +10:00
Xinchen Hui
adf0e49912
zend_hash_resize seems useless, use zend_hash_extend
2015-08-13 12:19:35 +08:00
Xinchen Hui
a089ce0cc6
Fixed bug #70258 and #70253
2015-08-13 12:08:57 +08:00
Xinchen Hui
e17b1266db
Revert "Updated to version 2015.6 (2015f)"
...
This reverts commit 7b476a600b .
2015-08-13 11:55:30 +08:00
Derick Rethans
7b476a600b
Updated to version 2015.6 (2015f)
2015-08-12 22:00:15 +01:00
Derick Rethans
a869e800ec
Empty merge
2015-08-12 22:00:15 +01:00
Derick Rethans
a1c06f10dd
Updated to version 2015.6 (2015f)
2015-08-12 22:00:13 +01:00
Christoph M. Becker
f1dacee467
updated NEWS
2015-08-12 19:03:35 +02:00
Christoph M. Becker
3b874086e2
Fix #70245 : strtotime does not emit warning when 2nd parameter is object or string
...
Caused by a refactoring strtotime() called
zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ...) instead of
zend_parse_parameters().
2015-08-12 19:01:04 +02:00
Anatol Belski
2366a070c8
improve condition
...
same as CSPRNG, break by EOF
2015-08-12 14:50:43 +02:00
Christopher Jones
b7031ba743
Further PHP 7 compat for OCI8
2015-08-12 21:57:16 +10:00
Bob Weinand
c17afbc4f1
Fix valgrind false positives with watchpoints
2015-08-12 10:42:49 +00:00
Xinchen Hui
0f68f12d95
Use the same error msg with resize
2015-08-12 16:46:57 +08:00
Xinchen Hui
d75228e201
We should not silently go on if the required size can not be met
2015-08-12 16:44:51 +08:00
Xinchen Hui
60b75eb9ed
Revert "We should not silently go on if the required size can not be met."
...
This reverts commit d2bcdec980 .
2015-08-12 16:44:18 +08:00
Xinchen Hui
d2bcdec980
We should not silently go on if the required size can not be met.
2015-08-12 16:40:59 +08:00
Anatol Belski
cbcacbb2da
improve condition
...
read() == 0 is EOL
2015-08-12 10:20:26 +02:00
Anatol Belski
1a2c5bc180
second part fixing vc14, type/specifier order also in definitions
2015-08-12 08:52:08 +02:00
Xinchen Hui
121409865b
use efree_size here
2015-08-12 11:15:09 +08:00
Dmitry Stogov
fef086d113
Revert "Simplify ZEND_EXIT and count boolean values to it as exit status"
...
This reverts commit 7c003948c6 .
2015-08-12 02:58:21 +03:00
Dmitry Stogov
9e290a44f1
Attempt to fix Windows build (vc14)
2015-08-12 02:47:37 +03:00
Bob Weinand
7c003948c6
Simplify ZEND_EXIT and count boolean values to it as exit status
2015-08-11 22:36:47 +02:00
Bob Weinand
dbd8edbbd0
Fixed bug #70241 (Skipped assertions affect Generator returns)
2015-08-11 22:12:06 +02:00
Anatol Belski
c173fef363
update NEWS
2015-08-11 17:37:36 +02:00
Anatol Belski
797e30f4fc
Fixed bug #70198 Checking liveness does not work as expected
2015-08-11 17:36:10 +02:00
Anatol Belski
87db2e4a91
fix news entry
2015-08-11 16:52:13 +02:00
Anatol Belski
8708fe7835
updated NEWS
2015-08-11 16:50:53 +02:00
Anatol Belski
80bc2133cd
fix bug #69833 mcrypt fd caching not working
2015-08-11 16:49:28 +02:00
Xinchen Hui
79cd9a18b5
Fixed bug #70237 (Empty while and do-while segmentation fault with opcode on CLI enabled).
2015-08-11 21:01:56 +08:00
Christoph M. Becker
42ef2b500b
updated NEWS wrt. bug #69487
2015-08-11 01:36:39 +02:00
Christoph M. Becker
48c71cd94b
Fix #69487 : SAPI may truncate POST data
...
If SG(request_info).request_body can't be completely written (e.g. due to a
full drive), only parts of the POST data will be available. This patch changes
this, so that SG(request_info).request_body will be reset in this case, and a
warning will be thrown.
2015-08-11 01:32:13 +02:00
Lior Kaplan
8bac087a79
Add CVE IDs asigned to #69085 (PHP 5.6.7)
2015-08-10 11:54:39 +03:00
Lior Kaplan
eaf5beabf4
Align NEWS with 5.6.12
2015-08-10 11:52:23 +03:00
Lior Kaplan
c1127c4de3
Add entries for phar bug fixes in 5.6.11 (also have CVE assigned)
2015-08-10 11:49:18 +03:00
Lior Kaplan
9ff3334397
Add CVE IDs asigned (post release) to PHP 5.4.43
2015-08-10 11:19:18 +03:00
Lior Kaplan
dc72378ff0
Add CVE IDs asigned to #69085 (PHP 5.4.39)
2015-08-10 11:18:33 +03:00
Christoph M. Becker
36cbb7cc4c
updated NEWS
2015-08-09 02:43:41 +02:00
wusuopu
72976e2497
Fix #66606 : Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE
...
The patch will store Content-Type header value in both HTTP_CONTENT_TYPE field and CONTENT_TYPE field.
2015-08-09 02:37:16 +02:00
Christoph M. Becker
1b4a80332c
added tests for bug #66606
2015-08-09 02:36:58 +02:00
Ferenc Kovacs
1797a716ed
fix NEWS
2015-08-07 08:46:10 +02:00
Steven Hilder
de5d4d7b42
Add test: unmangling private properties in anon class instances
2015-08-06 16:56:05 +00:00
Steven Hilder
7ecb761818
Allow property names from anonymous classes to be unmangled
2015-08-06 15:18:14 +00:00
Dmitry Stogov
90cb3bb7de
Reduce memory usage by using bitsets instead of array of bytes.
2015-08-06 15:41:50 +03:00
Dmitry Stogov
6d681876ee
Get rid of memcpy() in MAKE_NOP()
2015-08-06 15:40:40 +03:00
Ferenc Kovacs
ba3eb81240
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix NEWS
2015-08-06 09:52:50 +02:00
Ferenc Kovacs
8974539f13
fix NEWS
2015-08-06 09:52:24 +02:00
Stanislav Malyshev
2eaf28367d
fix 32-bit test
2015-08-05 12:04:26 -07:00
Anatol Belski
1da0bb248a
next version in NEWS
2015-08-05 15:22:27 +02:00
Anatol Belski
6edf641c1d
sync NEWS entries
2015-08-05 11:28:36 +02:00
Stanislav Malyshev
03b765173b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.5.29 next
2015-08-05 00:01:10 -07:00
Stanislav Malyshev
362bbaa2dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.29 next
Conflicts:
configure.in
main/php_version.h
2015-08-05 00:00:54 -07:00
Stanislav Malyshev
15e9f4baf4
5.5.29 next
2015-08-04 23:59:55 -07:00
Stanislav Malyshev
b221df5549
5.4.45 next
2015-08-04 23:56:15 -07:00
Stanislav Malyshev
feeb2fba93
fix merge
2015-08-04 23:51:55 -07:00
Stanislav Malyshev
6981bc32be
fix test
2015-08-04 16:47:44 -07:00
Stanislav Malyshev
3e416bba90
fix merge
2015-08-04 16:46:53 -07:00
Stanislav Malyshev
21602ec219
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix test
Conflicts:
sapi/cli/tests/005.phpt
2015-08-04 16:46:38 -07:00
Stanislav Malyshev
54187fa4b9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2015-08-04 16:45:55 -07:00
Stanislav Malyshev
2425f88afd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2015-08-04 16:45:32 -07:00
Stanislav Malyshev
da5321013c
fix test
2015-08-04 16:45:20 -07:00
Stanislav Malyshev
7b6dd533ba
Merge branch 'PHP-5.6'
...
* PHP-5.6:
virtual_file_ex uses emalloc in 5.6+
2015-08-04 16:33:07 -07:00
Stanislav Malyshev
eb7ba73079
virtual_file_ex uses emalloc in 5.6+
2015-08-04 16:31:57 -07:00
Stanislav Malyshev
54daa5317f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
__wakeup doesn't have to be final
2015-08-04 16:14:32 -07:00
Stanislav Malyshev
97047e7665
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
fix test
update NEWS
Fix bug #70019 - limit extracted files to given directory
Do not do convert_to_* on unserialize, it messes up references
Fix #69793 - limit what we accept when unserializing exception
Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
ignore signatures for packages too
Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
Fixed bug #69892
Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
Improved fix for Bug #69441
Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
Fix bug #70081 : check types for SOAP variables
Conflicts:
Zend/zend_exceptions.c
ext/date/php_date.c
ext/openssl/openssl.c
ext/phar/phar_internal.h
ext/soap/php_http.c
ext/spl/spl_array.c
ext/spl/spl_dllist.c
ext/spl/spl_observer.c
ext/standard/tests/serialize/bug69152.phpt
sapi/cli/tests/005.phpt
2015-08-04 16:14:24 -07:00
Stanislav Malyshev
568a35f84f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
__wakeup doesn't have to be final
2015-08-04 16:13:53 -07:00
Stanislav Malyshev
f2f8ea9ac5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
__wakeup doesn't have to be final
2015-08-04 16:13:43 -07:00
Stanislav Malyshev
f1acac154a
__wakeup doesn't have to be final
2015-08-04 16:13:26 -07:00
Stanislav Malyshev
ed709d5aa0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
fix test
update NEWS
Fix bug #70019 - limit extracted files to given directory
Do not do convert_to_* on unserialize, it messes up references
Fix #69793 - limit what we accept when unserializing exception
Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
ignore signatures for packages too
Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
Fixed bug #69892
Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
Improved fix for Bug #69441
Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
Fix bug #70081 : check types for SOAP variables
Conflicts:
ext/soap/php_http.c
ext/spl/spl_observer.c
2015-08-04 15:29:13 -07:00
Stanislav Malyshev
d52c485717
update NEWS
2015-08-04 15:22:59 -07:00
Nikhil Vimal
1e4742d5cd
Docs for find_tested.php
...
Initial Pass, also fixing the extra space before the extract_tests function name to keep with standards.
2015-08-04 16:46:47 -05:00
Stanislav Malyshev
742c54aecf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
update NEWS
2015-08-04 14:46:30 -07:00
Stanislav Malyshev
0a21b5d970
fix test
2015-08-04 14:46:19 -07:00
Stanislav Malyshev
ee61c7175f
update NEWS
2015-08-04 14:37:28 -07:00
Stanislav Malyshev
69ed3969dd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #70019 - limit extracted files to given directory
Do not do convert_to_* on unserialize, it messes up references
Fix #69793 - limit what we accept when unserializing exception
Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
ignore signatures for packages too
Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
Fixed bug #69892
Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
Improved fix for Bug #69441
Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
Fix bug #70081 : check types for SOAP variables
Conflicts:
.gitignore
ext/date/php_date.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
2015-08-04 14:10:57 -07:00
Stanislav Malyshev
51f9a00b47
Merge branch 'PHP-5.4' into PHP-5.4.44
...
* PHP-5.4:
Fixed bug #69892
Adjust Git-Rules
2015-08-04 14:04:24 -07:00
Stanislav Malyshev
dda81f0505
Fix bug #70019 - limit extracted files to given directory
2015-08-04 14:02:31 -07:00
Stanislav Malyshev
0e09009753
Do not do convert_to_* on unserialize, it messes up references
2015-08-04 13:59:56 -07:00
Dmitry Stogov
668ecaa606
Fixed bug #70098 (Real memory usage doesn't decrease)
2015-08-04 18:21:05 +03:00
Anatol Belski
ed8d16b173
run credits script
2015-08-04 16:30:53 +02:00
Dmitry Stogov
5202ba5a3e
Fixed possible access to uninitialized data (prevents valgrind issues in Zend/tests/bug70089.phpt)
2015-08-04 10:48:32 +03:00
Dmitry Stogov
fdb0dd9fc4
Added NEWS entry
2015-08-04 09:55:54 +03:00
Dmitry Stogov
58596897e9
Get rid of ZEND_FAST_CALL_UNBOUND
2015-08-04 08:35:40 +03:00
Dmitry Stogov
a16aa4c42c
Move most "finally" related code-generation from pass_two() to compiler.
2015-08-04 07:42:28 +03:00
Nikita Popov
743801054d
Try to fix finally issue
2015-08-04 07:42:28 +03:00
Christoph M. Becker
e39c525df8
Merge branch 'pull-request/1449'
...
* pull-request/1449:
Remove unneded space(s)
2015-08-04 03:37:41 +02:00
Bob Weinand
d0ad621906
Fix further leaks
2015-08-04 01:22:04 +02:00
Bob Weinand
d8fe645db4
Fix valgrind errors in phpdbg
...
Revert "We cannot safely assume that all op array will be refcount 0 after execution"
This reverts commit b6936adb58 .
This change turns out to not have been a clever idea and was causing more weirdness than it helped...
2015-08-04 00:00:10 +02:00
Bob Weinand
b20953118b
Fix last invalid read
...
Also revert debugging run-tests.php changes...
2015-08-03 20:49:41 +02:00
Bob Weinand
b5e16cebda
Fix a few valgrind errors in phpdbg
2015-08-03 20:27:46 +02:00
Bob Weinand
34596a3ddd
Fix breaking on HANDLE_EXCEPTION (opline_before_exception)
2015-08-03 17:15:40 +02:00
Dmitry Stogov
472a8414cc
Merge branch 'fast_memcpy' of github.com:bogdanandone/php-src
...
* 'fast_memcpy' of github.com:bogdanandone/php-src:
opcache: Patch SSE based fast_memcpy() implementation
2015-08-03 15:07:26 +03:00
Dmitry Patsura
ed3c7adc5f
Remove unneded space(s)
2015-08-03 18:38:41 +08:00
Dmitry Stogov
d28070870c
Fixed tests (system dependent numbers are replaced with %d)
2015-08-03 09:53:13 +03:00
Dmitry Stogov
7bc6706b6d
Fixed test
2015-08-03 09:11:38 +03:00
Christoph M. Becker
b4bd31b7a0
updated UPGRADING
...
The ZipArchive::setCompressionIndex() and ::setCompressionName() methods
introduced with 3a55ea02 were missing.
2015-08-03 00:24:39 +02:00
Bob Weinand
55fd8fabd9
Give better credit in NEWS
...
Patch is actually exactly what he proposed, so...
2015-08-02 19:49:52 +02:00
Bob Weinand
9e246a73ef
Fixed bug #70182 (Segfault in ZEND_ASSIGN_OP handlers)
2015-08-02 19:08:39 +02:00
Anatol Belski
a7587135e3
more info for UPGRADING.INTERNALS
2015-08-02 17:49:06 +02:00
Anatol Belski
56d163075b
updated NEWS
2015-08-02 16:53:11 +02:00
Hugh Davenport
2a1a8f9ea7
Fixed bug #70183 null pointer deref (segfault) in zend_eval_const_expr
2015-08-02 16:51:23 +02:00
Anatol Belski
8e528b2792
fix inconsistent dll linkage
2015-08-02 16:26:48 +02:00
Anatol Belski
545b364d56
remove TSRMLS_*
...
either remains or merged in from PHP5
2015-08-02 13:42:01 +02:00
Anatol Belski
8c4bbf0f47
properly export ext/odbc globals
2015-08-02 13:05:10 +02:00
Anatol Belski
f8903e80c7
updated NEWS
2015-08-02 09:30:00 +02:00
Anatol Belski
ee2e169108
Fixed bug #69896 'asm' operand has impossible constraints
...
Given it's an issue with 32-bit gcc-4.8, asm is disabled for the
breaking parts.
2015-08-02 09:25:24 +02:00
Anatol Belski
cddef30940
fix test
...
catching up with the localization changes in CRT
2015-08-02 09:24:19 +02:00
Stanislav Malyshev
4d2278143a
Fix #69793 - limit what we accept when unserializing exception
2015-08-01 22:02:26 -07:00
Stanislav Malyshev
863bf294fe
Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
2015-08-01 22:01:51 -07:00
Stanislav Malyshev
7381b6accc
Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
2015-08-01 22:01:40 -07:00
Stanislav Malyshev
c7d3c027d5
ignore signatures for packages too
2015-08-01 22:01:32 -07:00
Stanislav Malyshev
c2e197e4ef
Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
2015-08-01 22:01:17 -07:00
Nikita Popov
7fc04937f5
Fixed bug #69892
2015-08-01 20:47:43 -07:00
Christoph M. Becker
9f395b9e76
Merge branch 'PHP-5.6'
2015-08-01 23:55:44 +02:00
Christoph M. Becker
8d31e463a0
fixed test
2015-08-01 23:52:35 +02:00
Bob Weinand
06ef2aeca9
Skip shebang line if present
2015-08-01 23:28:55 +02:00
Pierrick Charron
fb37da2a48
Fixed Bug #69998 curl multi leaking memory
...
Fix the pointer address passed to the comparator and call
zend_list_delete instead of zend_list_close to avoid closing
the resource if still used.
2015-08-01 14:55:00 -04:00
Bob Weinand
2d6f0e4584
Fix bug #70179 ($this refcount issue)
2015-08-01 20:35:56 +02:00
Bob Weinand
351b4e8015
Optimize btree/find_closest a bit
2015-08-01 18:23:00 +02:00
Christoph M. Becker
f7c2128702
Merge branch 'PHP-5.6'
2015-08-01 14:21:01 +02:00
Christoph M. Becker
12f099e7bc
mentioned cURL file uploads in the "backward incompatible changes" section
2015-08-01 14:15:44 +02:00
Christoph M. Becker
78eab007a9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
test fails with old libxml2; skip in this case
2015-07-31 19:55:07 +02:00
Christoph M. Becker
6576d809a5
test fails with old libxml2; skip in this case
2015-07-31 19:52:42 +02:00
Anatol Belski
3a66a23679
avoid unnecessary scoping
2015-07-31 19:09:37 +02:00
Anatol Belski
7be9e69eaf
remove useless ifdefs
...
the most outer block already tell's it's ZTS code
2015-07-31 19:09:36 +02:00
Bob Weinand
624bedcadc
Fix tests
2015-07-31 18:22:04 +02:00
Christoph M. Becker
716387288e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
test requires imagejpeg(); skip otherwise
2015-07-31 13:54:32 +02:00
Christoph M. Becker
cdabbd9542
test requires imagejpeg(); skip otherwise
2015-07-31 13:51:49 +02:00
Anatol Belski
b6803c75d9
updated NEWS
2015-07-31 13:32:40 +02:00
Anatol Belski
b604716fb6
Fixed bug #70108 sometimes empty $_SERVER['QUERY_STRING']
...
auto_globals_jit is the reason every thread needs a copy. Otherwise
every thread will operate on the master values which can't end good.
2015-07-31 13:32:39 +02:00
Bob Weinand
590c5a7e50
Remove debug instructions (...)
2015-07-31 13:23:45 +02:00
Ferenc Kovacs
35b61e4f4d
pear 1.10.0dev2
2015-07-31 10:22:50 +02:00
Bob Weinand
ac87657d42
Implicit return should be always on the last line of a function
2015-07-31 02:44:42 +02:00
Bob Weinand
36aa92a67d
Do not mark automatic return 1; as executable
2015-07-31 02:26:28 +02:00
Bob Weinand
1da4ee25b8
Fix oplog trace with already freed closures
2015-07-31 02:06:03 +02:00
Ferenc Kovacs
57247f01f7
removed another E_STRICT(with the approval of Derick), 3 more to go
2015-07-30 13:53:44 +02:00
Christopher Jones
70a7221540
More PHP7 compat (Rajendra/Senthil)
2015-07-30 20:25:40 +10:00
Xinchen Hui
d00acdc312
update UPGRADING
2015-07-30 15:23:15 +08:00
Xinchen Hui
ee64c39f8e
Merge branch 'master' of git.php.net:php-src
2015-07-30 15:21:07 +08:00
Xinchen Hui
fb3d14460b
Fixed condition
2015-07-30 15:09:56 +08:00
Anatol Belski
ffa341de59
add macro to access globals as whole
2015-07-30 09:05:08 +02:00
Anatol Belski
c2bf735e49
fork test
2015-07-30 09:05:07 +02:00
Xinchen Hui
6c0feb0665
Fixed bug #70163 (curl_setopt_array() type confusion)
2015-07-30 13:40:59 +08:00
Xinchen Hui
a6b47e8d68
Merge branch 'zval_dump_consistent' of https://github.com/laruence/php-src
2015-07-30 13:14:38 +08:00
Xinchen Hui
3eabf2bf19
"This" is C++ keyword
2015-07-30 11:30:34 +08:00
Bob Weinand
ae1a4f47e6
Add NEWS entry
2015-07-29 21:00:43 +02:00
Anatol Belski
9249890acf
fix wrong info
2015-07-29 19:30:36 +02:00
Bob Weinand
d45d5271f7
Fix bug #70164 (__COMPILER_HALT_OFFSET__ under namespace is not defined)
2015-07-29 19:18:29 +02:00
Christoph M. Becker
8f7d816b0d
updated UPGRADING
2015-07-29 18:28:18 +02:00
Christoph M. Becker
6855e2f08b
Merge branch 'pull-request/1439'
...
* pull-request/1439:
fixed broken test
add new error constant PREG_JIT_STACKLIMIT_ERROR
2015-07-29 18:21:46 +02:00
Anatol Belski
f6d196a38f
document globals accesor macro and tls specifiers
2015-07-29 17:26:53 +02:00
Anatol Belski
859507c9af
add one more thread storage specifier to allow external link
2015-07-29 17:26:52 +02:00
Anatol Belski
c17289e59c
fix thread safety
2015-07-29 17:26:51 +02:00
Anatol Belski
db70a337ff
fix thread safety and zeroing method
2015-07-29 17:26:50 +02:00
Christoph M. Becker
2aa9db5a22
updated NEWS
2015-07-29 17:04:09 +02:00
Christoph M. Becker
ce3c869d19
Fix #70158 : Building with static imap fails
...
Static builds of ext/imap have duplicate symbols, and so won't link on Windows.
To get around this issue, we simply disallow static building of the extension.
2015-07-29 17:00:37 +02:00
Bogdan Andone
68185bafbe
opcache: Patch SSE based fast_memcpy() implementation
...
Use _mm_store_si128() instead of _mm_stream_si128(). This ensures that copied memory
is preserved in data cache, which is good as the interpretor will start to use this
data without the need to go back to memory. _mm_stream* is intended to be used for
stores where we want to avoid reading data into the cache and the cache pollution;
in our scenario it seems that preserving the data in cache has a positive impact.
Tests on WordPress 4.1 show ~1% performance increase with fast_memcpy() in place
versus standard memcpy() when running php-cgi -T10000 wordpress/index.php.
I also updated SW prefetching on target memory but its contribution is almost negligible.
The address to be prefetched will be used in a couple of cycles (at the next iteration)
while the data from memory will be available in >100 cycles.
2015-07-29 14:51:57 +03:00
Anatol Belski
4e66cce87c
switch to the unified globals accessor where appropriate
2015-07-29 13:26:35 +02:00
Christopher Jones
0615aa82d7
Fix temporary-LOB leak and add tests (Senthil)
2015-07-29 20:15:43 +10:00
Anatol Belski
0787cd60ed
first stone on using the unified globals accessor
2015-07-29 10:36:30 +02:00
Anatol Belski
43cdfd9a82
add unified globals accessor macro
2015-07-29 10:36:29 +02:00
Anatol Belski
7104d88c35
fix thread safety
2015-07-29 10:36:28 +02:00
Anatol Belski
7d41afeee8
fix thread safety
2015-07-29 10:36:27 +02:00
Julien Pauli
577ffcb55e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adjust Git-Rules
5.4.44 next
2015-07-29 10:05:19 +02:00
Julien Pauli
d7f354fa57
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Adjust Git-Rules
5.4.44 next
2015-07-29 10:04:33 +02:00
Julien Pauli
66edc15875
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Adjust Git-Rules
5.4.44 next
Conflicts:
configure.in
main/php_version.h
2015-07-29 10:04:08 +02:00
Julien Pauli
8f1baa6e1c
Adjust Git-Rules
2015-07-29 10:02:39 +02:00
Anton Blanchard
fd8fb17be8
Improve performance of PowerPC64 fast_long_add_function
...
Detecting overflow with the XER is slow, partially because we have to
clear it before use.
PHP already has a fast way of detecting overflow in its fallback
c implementation. Overflow only occurs if the signs of the two
operands are the same and the sign of the result is different.
Furthermore, leaving it in c allows gcc to schedule the instructions
better.
This is 9% faster on a POWER8 running a simple testcase:
<?php
function testcase($count = 100000000) {
$x = 1;
for ($i = 0; $i < $count; $i++) {
$x = $x + 1;
$x = $x + 1;
$x = $x + 1;
$x = $x + 1;
$x = $x + 1;
}
}
testcase();
?>
2015-07-29 09:22:38 +02:00
Remi Collet
32e9b744c0
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fixed bug #69674 (SIGSEGV array.c:953)
2015-07-29 09:22:21 +02:00
Xinchen Hui
7d5fb7bbf3
Fixed bug #69674 (SIGSEGV array.c:953)
2015-07-29 10:46:12 +08:00
Anton Blanchard
4d578f28df
Improve performance of PowerPC64 fast_long_increment_function
...
Detecting overflow with the XER is slow, partially because we have to
clear it before use.
gcc does a better job of detecting overflow of an increment or decrement
than we can with inline assembly. It knows that an increment will only
overflow if it is one less than the overflow value. This means we end
up with a simple compare/branch. Furthermore, leaving it in c allows gcc
to schedule the instructions better.
This is 6% faster on a POWER8 running a simple testcase:
<?php
function testcase($count = 100000000) {
$x = 1;
for ($i = 0; $i < $count; $i++) {
$x++;
$x++;
$x++;
$x++;
$x++;
}
}
testcase();
?>
2015-07-28 18:38:23 +02:00
Anton Blanchard
305199a131
Improve performance of PowerPC64 ZEND_SIGNED_MULTIPLY_LONG
...
Detecting overflow with the XER is slow, partially because we have to
clear it before use. We can do better by using a trick where we compare
the high 64 bits of the result with the low 64 bits shifted right
63 bits.
This is 7% faster on a POWER8 running a simple testcase:
<?php
function testcase($count = 100000000) {
for ($i = 0; $i < $count; $i++) {
$x = 1;
$x = $x * 2;
$x = $x * 2;
$x = $x * 2;
$x = $x * 2;
}
}
testcase();
?>
2015-07-28 18:38:23 +02:00
Anatol Belski
a581910a76
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed bug #70002 TS issues with temporary dir handling
update NEWS
Fixed bug #69900 Too long timeout on pipes
2015-07-28 17:44:14 +02:00
Anatol Belski
9fdb8c2ccd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #70002 TS issues with temporary dir handling
2015-07-28 17:42:37 +02:00
Anatol Belski
54bf6352fe
updated NEWS
2015-07-28 17:42:25 +02:00
Anatol Belski
ce5c4500cd
Fixed bug #70002 TS issues with temporary dir handling
2015-07-28 17:41:38 +02:00
Anatol Belski
5c98b9972f
improve ZEND_TLS declaration even more and move it to the better place
2015-07-28 16:59:53 +02:00
Anatol Belski
e6cbca77f5
use better name
2015-07-28 16:59:52 +02:00
Anatol Belski
d051bff8b6
simplify declaration
2015-07-28 16:59:51 +02:00
Anatol Belski
0c08ba8be4
add ZEND_THREAD specifier
2015-07-28 16:59:50 +02:00
Anatol Belski
2ec51faece
adjust storage class
...
It's more convenient do explicitly disable the external linking. Also
it's an improvement from the build access time perspective.
2015-07-28 16:59:49 +02:00
Julien Pauli
a28115ccdb
Fix for #70159 - Better magic constants substitution
2015-07-28 16:30:08 +02:00
Xinchen Hui
94e23b29a1
online test
2015-07-28 16:43:12 +08:00
Xinchen Hui
0bddc18619
Fixed bug #70156 (Segfault in zend_find_alias_name)
2015-07-28 16:39:58 +08:00
Anatol Belski
1647ee7ef0
update NEWS
2015-07-28 10:29:24 +02:00
Anatol Belski
20e765b841
Fixed bug #69900 Too long timeout on pipes
2015-07-28 10:28:45 +02:00
Xinchen Hui
5ac6b8bcc6
Always checks for exception before push call frame
2015-07-28 16:06:06 +08:00
Xinchen Hui
4e9674f1a3
Previously fix is not right
2015-07-28 14:54:53 +08:00
Xinchen Hui
df23dd78a5
Revert "Attempt to fix bug35437.phpt fails"
...
This reverts commit 16d6dfddef .
2015-07-28 14:54:20 +08:00
Xinchen Hui
ef04c5c584
Revert "re-generate zend_vm_execute.h"
...
This reverts commit 4b6d4a1214 .
2015-07-28 14:54:12 +08:00
Xinchen Hui
4b6d4a1214
re-generate zend_vm_execute.h
2015-07-28 11:15:57 +08:00
Xinchen Hui
45ea83ba97
Merge branch 'master' of git.php.net:php-src
2015-07-28 11:07:24 +08:00
Xinchen Hui
16d6dfddef
Attempt to fix bug35437.phpt fails
2015-07-28 11:06:52 +08:00
Bob Weinand
9a312687f0
Fix test execution result with opcache
2015-07-28 02:14:49 +02:00
Ferenc Kovacs
f3ad61126d
use https for fetching the pear installer
2015-07-28 01:47:29 +02:00
Christoph M. Becker
9aa47d914c
updated NEWS
2015-07-28 01:12:25 +02:00
Christoph M. Becker
4e8f01cb6e
Fix #36365 : scandir duplicates file name at every 65535th file
...
Due to DIR.offset being declared as short we have an overflow. This patch
changes the field to int.
2015-07-28 01:04:55 +02:00
Bob Weinand
33a91f57e9
Set CG(zend_lineno) to beginning for final class errors/ops
2015-07-28 00:57:49 +02:00
Christoph M. Becker
b6bcf9c51a
Add support for regenerating phpdbg lexers and scanners on Windows
2015-07-28 00:26:55 +02:00
Bob Weinand
c0e0f1414e
Fix phpdbg stepping on CATCH with exception
2015-07-28 00:10:42 +02:00
Remi Collet
80edd40383
fix memleak
2015-07-27 16:57:38 +02:00
Bob Weinand
248ebf0df6
Fix: A buf == NULL on filehandle will segfault
2015-07-27 16:57:09 +02:00
Xinchen Hui
11613a1b58
Cleanup and also include the error path into test
2015-07-27 22:22:13 +08:00
Remi Collet
605fbabfba
Fix test
...
Notice: we have duplicated tests
ext/standard/tests/file/dirname_*
ext/standard/tests/strings/dirname_*
2015-07-27 16:14:13 +02:00
Remi Collet
0014b9eda6
UPGRADING
2015-07-27 15:26:31 +02:00
Remi Collet
a70047ef30
NEWS
2015-07-27 15:24:06 +02:00
Remi Collet
e811770a68
Fix #70112 RFE Allow dirname to go up various times
2015-07-27 15:23:04 +02:00
Bob Weinand
64f25adb6b
Remove -Wunused-result warnings
2015-07-27 15:02:01 +02:00
Xinchen Hui
b17ecc1e02
Hmm, not sure why this is missed while merged
2015-07-27 11:19:58 +08:00
Xinchen Hui
9f56cfa9a1
Merge branch 'master' of git.php.net:php-src
2015-07-27 11:17:23 +08:00
Xinchen Hui
6aeee47b2c
Fixed bug #70140 (str_ireplace/php_string_tolower - Arbitrary Code Execution)
2015-07-27 11:17:05 +08:00
Stanislav Malyshev
16023f3e3b
Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
2015-07-26 17:43:16 -07:00
Stanislav Malyshev
7a4584d3f6
Improved fix for Bug #69441
2015-07-26 17:31:12 -07:00
Stanislav Malyshev
b7fa67742c
Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
2015-07-26 17:25:25 -07:00
Stanislav Malyshev
e488690d95
Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
2015-07-26 17:10:24 -07:00
Stanislav Malyshev
c96d08b272
Fix bug #70081 : check types for SOAP variables
2015-07-26 16:44:18 -07:00
Christoph M. Becker
6de470e0af
fixed broken test
2015-07-26 23:40:48 +02:00
Christoph M. Becker
e6f55339cc
add new error constant PREG_JIT_STACKLIMIT_ERROR
2015-07-26 23:40:38 +02:00
Bob Weinand
70c6a6f624
Fix infinite lexer loop for :\ sequence in phpdbg
2015-07-26 22:57:30 +02:00
Ferenc Kovacs
4cf9011c62
Merge branch 'PHP-5.6'
...
* PHP-5.6:
make the travis irc notification a oneliner
2015-07-26 22:07:07 +02:00
Ferenc Kovacs
e4153e9144
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
make the travis irc notification a oneliner
2015-07-26 22:06:51 +02:00
Ferenc Kovacs
daa0abaf77
make the travis irc notification a oneliner
2015-07-26 22:06:26 +02:00
Bob Weinand
f5bef4058c
Fix bug #70138 (difference between gcc and clang)
2015-07-26 21:49:18 +02:00
Bob Weinand
9e8fec1ef7
Fix leaks from bug #70138
2015-07-26 21:49:18 +02:00
Nikita Popov
a717acd21a
Fix RECV_VARIADIC literal compacting wrt cache slot
2015-07-26 21:22:31 +02:00
Anatol Belski
27c973a954
exclude the platform diff case from the test
...
Say the string is \377\000, basename will use mbrlen() to check whether
it's a start of a multibyte sequence. While on Linux it'll return -1 for
any char in the extended ASCII, on Windows it's returning 1. From what I
see the reason is that Windows doesn't implement UTF-8 in the CRT lib,
it's rather 16-bit Unicode or DBCS. Since extended ASCII is convertable
to Unicode directly - thus the behavior. On Linux however, it's a true
UTF-8 locale and implementation, for it \377\000 is invalid.
Maybe mbrlen needs an independent implementation for Windows supporting
UTF-8. For now I just split out this case so the most of the big basename
test doesn't fail on this one case.
2015-07-26 20:54:27 +02:00
Anatol Belski
c18f5e1edd
add NULL check
2015-07-26 20:54:26 +02:00
Christoph M. Becker
d73287be18
Merge branch 'PHP-5.6'
...
* PHP-5.6:
allow to skip slow tests
2015-07-26 17:35:23 +02:00
Christoph M. Becker
5be8872f44
allow to skip slow tests
2015-07-26 17:33:09 +02:00
Ferenc Kovacs
cd37e7c90d
use the new php7 compatible pear installer
2015-07-26 14:17:32 +02:00
Yasuo Ohgaki
62515a1dbb
Fixed Bug #70092 pg_field_type() is too slow
2015-07-26 05:29:27 +09:00
Bob Weinand
66fd52939b
Just always copy the buffer, that makes it much safer
...
At least compared to conditionally using the mmap()ped input
2015-07-25 19:50:31 +02:00
Bob Weinand
cdde4c51e1
Remove old unused header file
2015-07-25 01:35:29 +02:00
Bob Weinand
e960d3ed2c
Fix memory leak with opcache
2015-07-25 01:08:57 +02:00
Bob Weinand
b4c595dd82
Fix op_arrays with opcache
2015-07-25 00:31:05 +02:00
Bob Weinand
cf85985935
Fix print of ZEND_CATCH
2015-07-24 23:40:18 +02:00
Anatol Belski
9bae11d170
Revert "avoid pointer truncation"
...
This reverts commit 5334d53499 .
2015-07-24 22:30:46 +02:00
Bob Weinand
7ca85d8875
Fully fix typed generator returns
2015-07-24 22:04:05 +02:00
Anatol Belski
fa4cd519e6
fix printf format
2015-07-24 21:51:30 +02:00
Anatol Belski
5334d53499
avoid pointer truncation
2015-07-24 21:51:29 +02:00
Anatol Belski
05496c7312
fix scope
2015-07-24 21:51:28 +02:00
Bob Weinand
2eb845d0fa
Fix bug using not set temporary with typed generator returns
2015-07-24 20:31:18 +02:00
Anatol Belski
352bf686ce
update libs_version.txt
2015-07-24 20:24:50 +02:00
Anatol Belski
06c71b4774
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated libs_versions.txt
2015-07-24 20:24:12 +02:00
Anatol Belski
e42a29bf81
updated libs_versions.txt
2015-07-24 20:23:07 +02:00
Bob Weinand
f1698eedce
Fix non-debug build
2015-07-24 17:51:46 +02:00
Bob Weinand
76b882f0fc
Use relative paths in phpdbg_lexer.c
2015-07-24 17:33:45 +02:00
Bob Weinand
13525328ed
Cleanup shutdown, enable proper memory leak displaying
...
phpdbg should not memory leak...
2015-07-24 17:17:26 +02:00
Anatol Belski
bf1ecbfe16
fix libwebp namings
2015-07-24 17:06:29 +02:00
Xinchen Hui
d44fc4a073
Merge branch 'master' of git.php.net:php-src
2015-07-24 16:13:07 +08:00
Xinchen Hui
0f1e87d9c1
Fixed bug #70124 (null ptr deref / seg fault in ZEND_HANDLE_EXCEPTION)
2015-07-24 15:49:36 +08:00
Christoph M. Becker
1dab25689a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
added regression test for bug #55472 , which has already been fixed as of PHP 5.5.0
2015-07-24 01:25:45 +02:00
Christoph M. Becker
05ccc1f2d4
added regression test for bug #55472 , which has already been fixed as of PHP
...
5.5.0
2015-07-24 01:23:33 +02:00
Christoph M. Becker
50fd9d0c04
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #53854 : Missing constants for compression type
2015-07-23 21:43:40 +02:00
Christoph M. Becker
1a7db40a1f
Fix #53854 : Missing constants for compression type
...
The constants have already been added long ago. This patch just adds a PHPT
which checks the recognition of the respective compression methods.
Unfortunately, I've not been able to assemble a zip with all compression
methods.
2015-07-23 21:36:14 +02:00
Christoph M. Becker
19761a4801
updated NEWS
2015-07-23 18:46:00 +02:00
Christoph M. Becker
de3f60d536
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70052 : getimagesize() fails for very large and very small WBMP
Conflicts:
ext/standard/image.c
2015-07-23 18:40:54 +02:00
Christoph M. Becker
35e717e12e
updated NEWS
2015-07-23 18:37:07 +02:00
Christoph M. Becker
87829c09a1
Fix #70052 : getimagesize() fails for very large and very small WBMP
...
Very large WBMP (width or height greater than 2**31-1) cause an overflow and
circumvent the size limitation of 2048x2048 px. Very small WBMP (less than 12
bytes) cause a read error and are not recognized. This patch fixes both bugs.
2015-07-23 18:31:28 +02:00
Anatol Belski
084a6e43cd
enable ext/gd to support libpng16
2015-07-23 16:10:07 +02:00
Bob Weinand
9005b24aed
Fix build failure for non-osx *nixes
2015-07-23 14:55:13 +02:00
Bob Weinand
6704d8d421
Fix valgrind warning with sigaction
2015-07-23 14:26:50 +02:00
Bob Weinand
b7e8f65972
Fix printf format issues on 32 bit
2015-07-23 14:23:42 +02:00
Anatol Belski
e60bcaeb01
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix config.w32
fix C99 compat
Align CVE format for #69669
Fix 69882 entry
2015-07-23 07:43:33 +02:00
Anatol Belski
91f985b2f9
fix config.w32
2015-07-23 07:39:25 +02:00
Anatol Belski
3d38db3576
fix C99 compat
2015-07-23 07:39:16 +02:00
Xinchen Hui
add2b158e2
cleanup
2015-07-23 12:16:22 +08:00
Xinchen Hui
c55c7ef0ec
Make debug_val_dump and var_dump prints int and float the same
2015-07-23 12:14:34 +08:00
Xinchen Hui
3fe35ba80d
Make IS_TMP_VAR and IS_VAR differentiable
2015-07-23 11:36:46 +08:00
Xinchen Hui
0a5bbbdc92
Merge branch 'master' of git.php.net:php-src
2015-07-23 11:18:50 +08:00
Xinchen Hui
a123876b4e
Fixed bug #70117 (Unexpected return type error)
2015-07-23 11:16:10 +08:00
Bob Weinand
686b9039a6
Fix phpdbg test failure and crash with opcache
2015-07-23 01:03:03 +02:00
Bob Weinand
531fa70ba8
Opcache is assuming that op_arrays without refcount are always efree()d
...
We maybe should search for some other way, because just not refcounting the op_array is rather a dirty hack.
If possible, we should change opcache and just expect op_array->refcount != NULL ... but I have not found a clean way yet.
2015-07-22 23:16:50 +02:00
Lior Kaplan
6aa44ac73a
Align CVE format for #69669
2015-07-22 20:35:31 +03:00
Lior Kaplan
8560138274
Fix 69882 entry
2015-07-22 20:34:31 +03:00
Bob Weinand
3cc02533ae
Add phpdbg_get_executable() (gets executable ops/lines)
2015-07-22 18:11:35 +02:00
Bob Weinand
b6936adb58
We cannot safely assume that all op array will be refcount 0 after execution
...
Some extensions may want to analyze or re-run the op array later
2015-07-22 17:16:16 +02:00
Xinchen Hui
3e479ef424
Fixed bug #70111 (Segfault when a function uses both an explicit return type and an explicit cast)
2015-07-22 22:43:30 +08:00
Bob Weinand
d6415ae473
Always lowercase function names for lookup in phpdbg -p
2015-07-22 15:33:44 +02:00
Bob Weinand
264bed40a7
Fix opcode tests which may generate FCALL instead of ICALL
2015-07-22 13:49:28 +02:00
Bob Weinand
0da4a3ec2c
Add -e (ZEND_EXT_* generation) option to phpdbg
2015-07-22 13:46:06 +02:00
Nikita Popov
cff6cbc01f
Emit EXT_STMT for each statement
...
I'm excluding unticked statements for this (in 5.x they were included)
as this would just result in two consecutive EXT_STMTs.
Also add all class statements to unticked statements, these would
generate superfluous EXT_STMT/TICKS in the parent op_array.
2015-07-22 13:38:42 +02:00
Xinchen Hui
f56b89b0af
Fixed opcodes printing.
...
-p"function"
-p"class::"
-p"class::method"
2015-07-22 19:13:26 +08:00
Julien Pauli
c274e2397d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.6.13 now
Conflicts:
configure.in
main/php_version.h
2015-07-22 09:28:59 +02:00
Julien Pauli
3eee495570
5.6.13 now
2015-07-22 09:27:49 +02:00
Bob Weinand
348fc4d6fd
$argv and $argc may be IS_INDIRECT
2015-07-22 00:22:39 +02:00
Bob Weinand
262d32634b
Undefined values may lead to big allocation
2015-07-22 00:02:59 +02:00
Nikita Popov
7c661bd304
Remove FAST_CALL_FROM_CATCH
...
This was generated for a return from a try block with both a catch
and a finally. However at this point no exception can be active,
because it either didn't exist in the first place or was explicitly
discarded using DISCARD_EXCEPTION.
2015-07-21 21:13:34 +02:00
Bob Weinand
2141ab9be5
Fix bug #70106 (Inheritance by anonymous class)
2015-07-21 20:34:06 +02:00
Bob Weinand
81a2c43d5e
Add an option to not generate INIT_FCALL ops for user functions too
2015-07-21 16:39:49 +02:00
Anatol Belski
d1a026997a
version up in NEWS
2015-07-21 16:37:43 +02:00
Anatol Belski
0b31192bc7
remove BOM from NEWS
2015-07-21 16:36:36 +02:00
Anatol Belski
6065b29fe4
Reverted ad4533fdba
...
The E_ERROR to E_RECOVERABLE_ERROR should be readded with the
proper tests.
2015-07-21 11:18:36 +02:00
Anatol Belski
1767992e4e
update UPGRADING
2015-07-21 11:12:08 +02:00
Anatol Belski
00361072c6
updated NEWS
2015-07-21 10:42:06 +02:00
Anatol Belski
af0f857c01
fix comment
2015-07-21 10:37:08 +02:00
Anatol Belski
4646e6e7d3
libwebp support for linux
2015-07-21 10:37:07 +02:00
Christoph M. Becker
00ba7e6215
Replaced libvpx by libwebp (first draft; Windows only)
...
ext/gd/libgd/gd_webp.c has been taken from libgd[1]. Mainly, gd_error(X) has
been subsituted by zend_error(E_ERROR, X) and BGD_DECLARE(X) by X. Further
modifications are obvious from the diff.
All GD tests are passing, what raises hope, but we need more WebP tests,
anyway.
[1] <https://github.com/libgd/libgd/blob/7ec030c4f1dae75ed5d82c3eed2abe6775742c75/src/gd_webp.c >
2015-07-21 10:37:06 +02:00
Anatol Belski
9b9448a54a
update news with bug #70022
2015-07-21 09:22:45 +02:00
Yasuo Ohgaki
ad4533fdba
Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR.
2015-07-21 12:59:23 +09:00
Christoph M. Becker
22767a48a7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add tests for json_last_error()/json_last_error_msg() failures
2015-07-21 02:00:16 +02:00
Kubo2
f18ba0f9c9
Add tests for json_last_error()/json_last_error_msg() failures
2015-07-21 01:50:40 +02:00
Christoph M. Becker
0c651cf8c3
updated NEWS
2015-07-21 01:24:55 +02:00
Christoph M. Becker
16d6a93f09
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
revised bug53156.phpt
Fix #53156 : imagerectangle problem with point ordering
2015-07-21 01:20:02 +02:00
Christoph M. Becker
e3a85074ed
updated NEWS
2015-07-21 01:17:51 +02:00
Christoph M. Becker
f1228ebc61
Merge branch 'pull-request/1425' into PHP-5.6
...
* pull-request/1425:
revised bug53156.phpt
Fix #53156 : imagerectangle problem with point ordering
2015-07-21 01:13:04 +02:00
Bob Weinand
b8534daa31
Exclude opcache from a few opcode related tests
2015-07-21 00:06:34 +02:00
Christoph M. Becker
81a008563b
updated NEWS
2015-07-20 23:50:40 +02:00
Christoph M. Becker
ea37ca7707
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #66387 : Stack overflow with imagefilltoborder
2015-07-20 23:44:04 +02:00
Christoph M. Becker
8461a87454
updated NEWS
2015-07-20 23:40:23 +02:00
Christoph M. Becker
e7f2356665
Fix #66387 : Stack overflow with imagefilltoborder
...
The stack overflow is caused by the recursive algorithm in combination with a
very large negative coordinate passed to gdImageFillToBorder(). As there is
already a clipping for large positive coordinates to the width and height of
the image, it seems to be consequent to clip to zero also.
2015-07-20 23:36:32 +02:00
Bob Weinand
80bb4fd45a
Fix various Windows issues (e.g. dir separators)
2015-07-20 23:26:45 +02:00
Nikita Popov
94fb5391e7
Remove bogus exception_save() from FETCH_CLASS
...
There can't be no exception at the start of the op. Also would miss
the corresponding exception_restore().
2015-07-20 22:56:51 +02:00
Bob Weinand
7aa2be060c
Fix readline/libedit build
2015-07-20 22:45:05 +02:00
Bob Weinand
f0b50963e5
Do not use readline when not having a tty
...
This is important for e.g. run-tests.php
2015-07-20 21:57:00 +02:00
Bob Weinand
6aadeba213
Add show_unexecuted option to phpdbg_end_oplog()
2015-07-20 20:41:07 +02:00
Bob Weinand
378a05f0de
Move phpdbg tests to .phpt mechanism
...
Also add a few more in-depth tests related to $argv, breakpoints and uncaught exceptions
2015-07-20 18:00:43 +02:00
Bob Weinand
75a3de0cd8
Fix misbehaviors with uncaught exceptions and finally or eval
2015-07-20 18:00:43 +02:00
Bob Weinand
4dc0546a59
Preserve argv consistency over multiple runs
2015-07-20 18:00:43 +02:00
Bob Weinand
acba295088
Fix info vars with refs/indirects
2015-07-20 18:00:43 +02:00
Bob Weinand
22c7c1189a
Fix function/method breakpoint case sensitivity issues
2015-07-20 18:00:43 +02:00
Bob Weinand
50e76d951e
Always only halt upon first non-recv opcode in a function
2015-07-20 18:00:42 +02:00
Bob Weinand
1f9bba68a9
Make opcode breakpoints work again
2015-07-20 18:00:42 +02:00
Bob Weinand
e3cd0709db
Do never clean stdin buffer away
2015-07-20 18:00:42 +02:00
Bob Weinand
dee629c92d
Fix use of already freed hashtable (wrong variable)
2015-07-20 18:00:42 +02:00
Bob Weinand
699e641e93
Do not show "Script ended normally" upon forced rerun
2015-07-20 18:00:42 +02:00
Bob Weinand
6435eb8019
Do not display compilation success / normal script end in -rr mode
2015-07-20 18:00:42 +02:00
Christoph M. Becker
2ec8611293
revised bug53156.phpt
2015-07-20 03:05:22 +02:00
Christoph M. Becker
72b73e24a0
Fix #53156 : imagerectangle problem with point ordering
...
Contrary to imagefilledrectangle(), imagerectangle() has the documented
limitation that the given points have to be the upper left and the lower right
corner, respectively. However, libgd already caters to upper right / lower left
pairs, and not catering to the other two combinations seems to be an oversight.
2015-07-20 02:14:29 +02:00
Christoph M. Becker
440d715632
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added basic test for imagewebp() and imagecreatefromwebp()
2015-07-19 23:11:11 +02:00
Christoph M. Becker
90de2aeaac
Added basic test for imagewebp() and imagecreatefromwebp()
2015-07-19 23:05:07 +02:00
Christoph M. Becker
3002ba468c
updated NEWS
2015-07-19 22:44:53 +02:00
Christoph M. Becker
6c8dbfd5c1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #70102 : imagecreatefromwebm() shifts colors
2015-07-19 22:40:49 +02:00
Christoph M. Becker
4b2d025937
updated NEWS
2015-07-19 22:39:18 +02:00
Christoph M. Becker
a31fe58d80
Fix #70102 : imagecreatefromwebm() shifts colors
...
libgd internally uses ARGB format, so we have to decode to ARGB instead of
RGBA.
2015-07-19 22:33:54 +02:00
Christoph M. Becker
209223b97e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed Fix #66590 , which may segfault
2015-07-19 22:01:20 +02:00
Christoph M. Becker
d3958b32ca
fixed Fix #66590 , which may segfault
2015-07-19 21:54:55 +02:00
Anatol Belski
3de0ae5477
fix two clang errors on Windows
2015-07-19 20:06:31 +02:00
Anatol Belski
61ebc6c615
exclude a non windows test
2015-07-19 19:53:53 +02:00
Christoph M. Becker
0ea35e1732
updated NEWS
2015-07-19 17:48:02 +02:00
Christoph M. Becker
f9d95a4003
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #66590 : imagewebp() doesn't pad to even length
2015-07-19 17:45:16 +02:00
Christoph M. Becker
9e08c990ac
updated NEWS
2015-07-19 17:43:44 +02:00
Christoph M. Becker
96e42403d5
Fix #66590 : imagewebp() doesn't pad to even length
...
The code in the bundled libgd uses libvpx and writes the riff manually. The
code generates the correct even size, but neglects the padding. It's possible
older versions of libwebp would decode this, but libwebp 0.4.0 does not.
Let's apply the patch supplied by one of the WebP developers.
2015-07-19 17:38:04 +02:00
Rasmus Lerdorf
3760cb6a59
wddx_add_vars() returns a bool
2015-07-19 07:05:03 -07:00
Christoph M. Becker
1e29edada7
updated NEWS
2015-07-18 22:57:02 +02:00
Christoph M. Becker
3ed0d18152
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70096 : Repeated iptcembed() adds superfluous FF bytes
Conflicts:
ext/standard/iptc.c
2015-07-18 22:52:39 +02:00
Christoph M. Becker
abc3598f47
updated NEWS
2015-07-18 22:50:11 +02:00
Christoph M. Becker
8c483ce36c
Fix #70096 : Repeated iptcembed() adds superfluous FF bytes
...
When there is already an APP13 marker segment in the file, iptcembed() doesn't
skip the first byte (0xFF) of this segment, what leads to unnecessary and
potentially invalid duplication of this byte. This patch fixes this issue.
2015-07-18 22:48:54 +02:00
Nikita Popov
f809f28119
Check mbfl_filt_put_invalid_char return value
...
And fix some libmbfl warnings
2015-07-18 21:53:03 +02:00
Nikita Popov
4ac0d96faa
Deduplicate usort code
2015-07-18 21:53:03 +02:00
Christoph M. Becker
77140d8b3d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed PHPT that is always being skipped or otherwise would fail
2015-07-18 21:35:54 +02:00
Christoph M. Becker
a66efb0b15
fixed PHPT that is always being skipped or otherwise would fail
2015-07-18 21:33:20 +02:00
Nikita Popov
df031961ad
Correctly handle zend_hash_sort failure
...
This can't actually happen right now, but should it become possible
we won't be leaking everything anymore.
2015-07-18 20:07:00 +02:00
Nikita Popov
179c8a2a09
Fix usort modification detection
...
This would delref the wrong array, leading to a segfault.
2015-07-18 20:07:00 +02:00
Jakub Zelenka
4540e644ec
Regenerate bison and re2c files in json
2015-07-18 17:41:17 +01:00
Nikita Popov
4854b11566
Partially fix XSLT warnings
...
The two remaining issues seem to be genuine problems. We're treating
node->children as a string, even though it's actually an xmlNode.
The same code exists twice in xpath.c. In all cases gcov shows no
coverage for it.
2015-07-17 21:12:15 +02:00
Nikita Popov
42e32c33e2
More warning fixes
2015-07-17 21:12:15 +02:00
Nikita Popov
36e49c702b
Fix simplexml warnings
2015-07-17 21:12:15 +02:00
Anatol Belski
a685953969
fix duplicated line
2015-07-17 20:30:21 +02:00
Nikita Popov
5c95226d50
Various warning fixes
2015-07-17 20:18:25 +02:00
Nikita Popov
90d9adccec
Fix zlib_filter warnings
2015-07-17 19:48:06 +02:00
Nikita Popov
981c618749
Remove --with-t1lib from travis build
2015-07-17 19:08:08 +02:00
Nikita Popov
0284755d97
Always use libtool --silent
...
We don't need this spam for debug builds. Now make --quiet does
something useful for debug builds as well.
2015-07-17 19:03:56 +02:00
Nikita Popov
8a9eee8f7e
Fix mysqlnd warnings
2015-07-17 17:48:02 +02:00
Nikita Popov
0039a3e96f
Fixed signed/unsigned warnings in wddx
...
Also added extra const annotation to zend_memnstr.
2015-07-17 17:19:23 +02:00
Nikita Popov
e97cb1427f
Remove dead goto label in phpdbg_cmd.c
2015-07-17 16:53:07 +02:00
Nikita Popov
20e5027293
Switch asprintf to spprintf in phpdbg opcode dump
...
Also use %td where appropriate, a lot of the values are ptrdiff
based.
Fix a leak in phpdbg_frame.c.
2015-07-17 16:53:07 +02:00
Nikita Popov
75dc4486b2
Make s(tr)pprintf infallible
...
spprintf now always creates a buffer and strpprintf always returns
a zend_string. Previously, if the result of the format happened to
be empty, the spprintf buffer would be set to NULL and strpprintf
would return NULL.
2015-07-17 16:53:06 +02:00
Anatol Belski
daba578dbe
fix file cache path calculation at all the places
...
moved the corresponding code into a separte function while on that
2015-07-17 15:14:25 +02:00
Anatol Belski
4c87750c26
fix path handling for the file cache
2015-07-17 13:51:16 +02:00
Xinchen Hui
2c048afd3b
Donot use one_char_string
2015-07-17 16:09:11 +08:00
Xinchen Hui
91e5b30a3b
Merge branch 'master' of git.php.net:php-src
2015-07-17 15:56:28 +08:00
Xinchen Hui
7d07afd6c1
Fixed bug #70089 (segfault at ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER ())
2015-07-17 15:55:34 +08:00
Nikita Popov
c568ffe517
Ignore getcwd return in zend_compile
...
To do this move the php_ignore_value macro to ZEND_IGNORE_VALUE.
2015-07-16 22:48:56 +02:00
Nikita Popov
208257eec5
Explicitly ignore mblen(NULL, 0) retval
2015-07-16 22:39:11 +02:00
nikita2206
d8a6130660
Handle empty (NULL) stmt in ast_export
2015-07-16 22:31:36 +02:00
Bob Weinand
9ee52ca3ae
Merge remote-tracking branch 'origin/PHP-5.6'
2015-07-16 19:12:38 +02:00
Anatol Belski
0dce8373cd
forked test for windows
2015-07-16 15:05:04 +02:00
Xinchen Hui
deeb6379cb
Fixed bug #70079 (Segmentation fault after more than 100 SoapClient calls)
2015-07-16 18:32:42 +08:00
Bob Weinand
c13124cc0f
Cleanup exception displaying code in phpdbg
2015-07-16 10:28:59 +02:00
Bob Weinand
37e03f6b32
Fix test; this should properly emit a fatal error, just as every other by-ref assignment to an overloaded object
2015-07-16 09:29:43 +02:00
Bob Weinand
0242653377
Fix test; this should properly throw an Error, just as every other by-ref assignment to an overloaded object
2015-07-16 09:25:19 +02:00
Christopher Jones
e6d9061e85
More OCI8 diff fixes (Rajendra)
2015-07-16 13:06:35 +10:00
Bob Weinand
f57cb13c56
Backport fix for bug #70083 to PHP-5.6
2015-07-15 22:46:53 +02:00
Bob Weinand
0af0733352
Fixed bug #70083 (Use after free with assign by ref on overloaded objects)
2015-07-15 22:36:42 +02:00
Bob Weinand
d25f3819c7
Fix crash on non-debug for phpdbg_end_oplog()
2015-07-15 22:30:12 +02:00
Rasmus Lerdorf
73773c2175
unserialize() takes a 2nd optional arg and it can't be a bool
2015-07-15 09:59:31 -07:00
Bob Weinand
af0d6256d5
Fix [valid] valgrind warnings, add first watchpoints test
2015-07-15 14:22:51 +00:00
Dmitry Stogov
a658465ef2
Export argument type checking functions
2015-08-11 19:11:21 +03:00
Anatol Belski
5b017ba8be
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
Fixed bug #70198 Checking liveness does not work as expected
2015-08-11 17:38:34 +02:00
Anatol Belski
c1de584e3f
update NEWS
2015-08-11 17:09:31 +02:00
Anatol Belski
8d6373b7ea
updated NEWS
2015-08-11 16:55:04 +02:00
Anatol Belski
f61b01efa2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix news entry
updated NEWS
fix bug #69833 mcrypt fd caching not working
2015-08-11 16:54:27 +02:00
Xinchen Hui
9834cd9339
Revert "Revert "suggest parentheses around ‘&&’ within ‘||’""
...
This reverts commit ec1e8929c4 .
2015-08-11 22:34:39 +08:00
Xinchen Hui
5a640d8aed
Merge branch 'master' of git.php.net:php-src
...
Conflicts:
ext/standard/tests/streams/bug70198.phpt
2015-08-11 22:31:47 +08:00
Anatol Belski
6608821a87
make this test more robust on slower execution
2015-08-11 16:30:14 +02:00
Xinchen Hui
faa3c9d291
Fixed the test, and make it faster while failingt
2015-08-11 22:30:02 +08:00
Xinchen Hui
ec1e8929c4
Revert "suggest parentheses around ‘&&’ within ‘||’"
...
This reverts commit 4f2c0e0451 .
2015-08-11 22:14:37 +08:00
Xinchen Hui
b997130a34
Update NEWS
2015-08-11 21:44:47 +08:00
Xinchen Hui
6e894f8b81
Merge branch 'PHP-5.6'
2015-08-11 21:44:04 +08:00
Xinchen Hui
4f2c0e0451
suggest parentheses around ‘&&’ within ‘||’
2015-08-11 21:43:38 +08:00
Xinchen Hui
4064ee3061
Fixed bug #70240 (Segfault when doing unset($var());)
2015-08-11 21:42:11 +08:00
Dmitry Stogov
162bf9e802
Reimplemented ability to get debug info (C source file and line number) in phpdbg without hacks and ABI breaks.
2015-08-11 16:33:47 +03:00
Anatol Belski
7eb6bd1311
add EAGAIN checks
...
EAGAIN and EWOULDBLOCK should be checked together and don't necessary,
have same value. So checking both is better for portability.
2015-08-11 15:17:25 +02:00
Anatol Belski
8d2b131d9f
add test for bug #70198
2015-08-11 15:00:17 +02:00
Anatol Belski
24f0fe6b1f
Fixed bug #70198 Checking liveness does not work as expected
2015-08-11 14:40:34 +02:00
Anatol Belski
b0893344df
integrate static tsrmls cache with ext/mcrypt
2015-08-11 12:32:00 +02:00
Anatol Belski
f15ec180ad
add folds
2015-08-11 12:11:24 +02:00
Xinchen Hui
275dd5d8ec
Merge branch 'marcosptf-enchant-phpt' of https://github.com/marcosptf/php-src
2015-08-11 11:13:01 +08:00
Christoph M. Becker
9f37f5f344
updated NEWS wrt. bug #69487
2015-08-11 01:43:40 +02:00
Christoph M. Becker
37707b2dd6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #69487 : SAPI may truncate POST data
2015-08-11 01:42:25 +02:00
Christoph M. Becker
913fc54e0f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add CVE IDs asigned to #69085 (PHP 5.6.7)
Align NEWS with 5.6.12
Add entries for phar bug fixes in 5.6.11 (also have CVE assigned)
2015-08-11 01:23:18 +02:00
Andrea Faulds
8394713e5d
Replace bug70018 test (broken on non-GNU) with win32 version
2015-08-11 00:23:24 +02:00
Dmitry Stogov
bdada12dae
Reverted useless cleanup code
2015-08-10 23:55:37 +03:00
marcosptf
20448abc65
Update broker_describe.phpt
2015-08-10 15:54:22 -03:00
marcosptf
6222e5f196
Update broker_describe.phpt
2015-08-10 14:50:32 -03:00
marcosptf
5dc3dadf71
Update dict_check.phpt
2015-08-10 14:14:13 -03:00
Dmitry Stogov
97f159d702
Support for XLC compiler
2015-08-10 19:12:11 +03:00
Xinchen Hui
4b90d63b57
Merge branch 'master' of git.php.net:php-src
2015-08-10 23:25:02 +08:00
Anatol Belski
d632eff9c0
fix test
2015-08-10 17:20:23 +02:00
Xinchen Hui
bf6d8d5188
Merge branch 'master' of git.php.net:php-src
2015-08-10 23:00:27 +08:00
Xinchen Hui
89940993f0
Fixed Bug #70173 (ZVAL_COPY_VALUE_EX broken for 32bit Solaris Sparc)
2015-08-10 22:58:58 +08:00
Dmitry Stogov
adcb1102e7
Fixed typo
2015-08-10 17:57:49 +03:00
Xinchen Hui
644bb2f654
Merge branch 'copy-32bit-be' of https://github.com/cmb69/php-src
2015-08-10 22:54:47 +08:00
Bob Weinand
cdc0dd4826
Merge branch 'ts_bin_hex_conv' of https://github.com/bwoebi/php-src
2015-08-10 16:16:59 +02:00
Xinchen Hui
b6dc6c254f
Merge branch 'master' of git.php.net:php-src
2015-08-10 22:03:33 +08:00
Xinchen Hui
55a017c303
Add XFAIL test for #70228
2015-08-10 22:02:15 +08:00
Xinchen Hui
87a5f2c486
Fixed no return statement in function returning non-void
2015-08-10 21:48:17 +08:00
Dmitry Stogov
18fb424bef
Fixed bug #70207 (Finally is broken with opcache)
2015-08-10 16:38:43 +03:00
Xinchen Hui
aaf7638706
Fixed bug #70221 (persistent sqlite connection + custom function segfaults)
2015-08-10 19:00:35 +08:00
Xinchen Hui
16f2ce8537
Hmm, we should also take care of uninitialized hashTable
2015-08-10 17:58:24 +08:00
Xinchen Hui
aa546256e3
Fixed bug #70223 (Incrementing value returned by magic getter)
2015-08-10 17:12:45 +08:00
Xinchen Hui
73a69c9c03
Fixed typo
2015-08-10 17:06:17 +08:00
Xinchen Hui
1bf20a18cf
Merge branch 'master' of git.php.net:php-src
2015-08-10 17:03:36 +08:00
Xinchen Hui
be54eb7db1
Fixed bug #70211 (php 7 ZEND_HASH_IF_FULL_DO_RESIZE use after free)
2015-08-10 17:02:16 +08:00
Anatol Belski
a88edb3bed
fix wording
2015-08-10 10:43:53 +02:00
Anatol Belski
0f8bc1cec9
one bracket too much
2015-08-10 10:42:10 +02:00
Anatol Belski
e7e646b0e5
add check for required re2c
...
>=0.13.5 is required for php-7.0.0
2015-08-10 10:40:14 +02:00
Anatol Belski
f318bffec3
catch up with the current requirement
...
bison 3.0.2 is used for php-7.0.0
2015-08-10 10:34:26 +02:00
Anatol Belski
df71933bd2
make use of PHPROOT for possible mkdist integration
2015-08-10 09:57:05 +02:00
Anatol Belski
c0b3665f37
make scripts/dev/gen_verify_stub executable
2015-08-10 09:50:54 +02:00
Anatol Belski
7600f5246c
initial add verification stub generator
2015-08-10 09:48:28 +02:00
Anatol Belski
a91065c63c
don't close stdin
2015-08-09 18:54:20 +02:00
Anatol Belski
a94ea9c97a
fix the mcrypt related part of bug #64833
2015-08-09 18:40:29 +02:00
Christoph M. Becker
79f64e5e67
Fix #70173 : ZVAL_COPY_VALUE_EX broken for 32bit Solaris Sparc
...
On 32bit big endian architectures the high word of a zend_value is copied
twice, instead of copying both words. Let's fix it.
2015-08-09 15:01:37 +02:00
marcosptf
3c41ab9ce9
Update broker_free.phpt
2015-08-09 08:15:33 -03:00
marcosptf
32fb77952f
Update broker_dict_exists.phpt
2015-08-09 08:14:56 -03:00
marcosptf
d3cd2f8221
Update broker_describe.phpt
2015-08-09 08:14:19 -03:00
marcosptf
b7c5afbe99
Update dict_suggest.phpt
2015-08-09 08:13:12 -03:00
marcosptf
10ad115518
Update dict_store_replacement.phpt
2015-08-09 08:11:32 -03:00
marcosptf
49510ef7aa
Update dict_quick_check_01.phpt
2015-08-09 08:09:13 -03:00
marcosptf
63990ab18a
Update dict_quick_check.phpt
2015-08-09 08:06:48 -03:00
marcosptf
ec24053797
Update dict_is_in_session.phpt
2015-08-09 08:04:49 -03:00
marcosptf
fe497170bd
Update dict_get_error.phpt
2015-08-09 08:02:05 -03:00
marcosptf
ef3e2d7beb
Update dict_describe.phpt
2015-08-09 07:58:58 -03:00
marcosptf
4129b50d23
Update dict_check.phpt
2015-08-09 07:56:23 -03:00
marcosptf
1cb530058e
Update dict_add_to_session.phpt
2015-08-09 07:54:44 -03:00
marcosptf
a7b9e3172d
Update dict_add_to_personal.phpt
2015-08-09 07:52:04 -03:00
marcosptf
c2bc106608
Update broker_set_ordering.phpt
2015-08-09 07:48:51 -03:00
marcosptf
018c412b5c
Update broker_request_dict_01.phpt
2015-08-09 07:45:06 -03:00
marcosptf
4848b6af6b
Update broker_request_dict_01.phpt
2015-08-09 07:44:04 -03:00
marcosptf
b8fdc02536
Update broker_request_dict.phpt
2015-08-09 07:43:02 -03:00
marcosptf
9d3818c4cb
Update broker_list_dicts.phpt
2015-08-09 07:37:50 -03:00
marcosptf
58c77c3610
Update broker_init.phpt
2015-08-09 07:35:59 -03:00
marcosptf
4191709915
Update broker_get_error.phpt
2015-08-09 07:31:56 -03:00
marcosptf
c9857071d4
Update broker_free_01.phpt
2015-08-09 07:29:50 -03:00
marcosptf
8fa0ef538e
Update broker_free.phpt
2015-08-09 07:28:17 -03:00
marcosptf
158aca848a
new test refactor
2015-08-09 07:23:07 -03:00
marcosptf
55f9427688
test refactor
...
refactor of this test did ten years ago, make it more resilient.
2015-08-09 07:17:30 -03:00
Anatol Belski
06a19cf218
fix typo in NEWS
2015-08-09 10:40:07 +02:00
Christoph M. Becker
64a5189358
updated NEWS
2015-08-09 02:59:15 +02:00
Christoph M. Becker
fc69549593
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #66606 : Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE
added tests for bug #66606
2015-08-09 02:51:16 +02:00
Bob Weinand
cab75d8b00
Fixed bug #70215 (segfault when __invoke is static)
2015-08-08 16:19:12 +02:00
Bob Weinand
0c60524190
Fixed bug #70214 (FASYNC possibly not defined)
2015-08-08 15:53:27 +02:00
Bob Weinand
b7aac1f5f2
Fixed bug #70208 (Assert breaking access on objects)
2015-08-08 00:02:49 +02:00
marcosptf
d2632efe5e
Update broker_list_dicts.phpt
2015-08-07 15:16:31 -03:00
marcosptf
e36431fbee
Update dict_suggest.phpt
2015-08-07 15:14:22 -03:00
Lior Kaplan
cc53406747
Add FR to #70112 news entry
2015-08-07 20:20:04 +03:00
marcosptf
a49260f197
Update dict_suggest.phpt
2015-08-07 14:10:32 -03:00
marcosptf
01988890a0
Update broker_list_dicts.phpt
2015-08-07 14:08:26 -03:00
marcosptf
696ce3f1e7
Update dict_describe.phpt
2015-08-07 14:04:53 -03:00
Christoph M. Becker
4adbe41e2f
Merge branch 'pull-request/1458'
...
* pull-request/1458:
Check the function UConverter::getAvailable with parameter wrong
2015-08-07 18:17:21 +02:00
marcosptf
b9d40accc4
Update dict_describe.phpt
2015-08-07 13:16:07 -03:00
marcosptf
3760fe3514
Update broker_list_dicts.phpt
2015-08-07 13:12:46 -03:00
marcosptf
348cb72ad7
Create dict_suggest.phpt
2015-08-07 11:44:30 -03:00
marcosptf
aed64ccab6
Rename dict_quick_check.phpt to dict_quick_check_01.phpt
2015-08-07 11:42:29 -03:00
marcosptf
6f6b629e8f
Create dict_store_replacement.phpt
2015-08-07 11:38:11 -03:00
marcosptf
d26b5cab41
Create dict_suggest.phpt
2015-08-07 11:37:40 -03:00
marcosptf
e6bc14b6df
Create dict_is_in_session.phpt
2015-08-07 11:37:04 -03:00
marcosptf
b3a96b3aaa
Create dict_get_error.phpt
2015-08-07 11:36:29 -03:00
marcosptf
90f9516cd9
Create dict_describe.phpt
2015-08-07 11:35:35 -03:00
marcosptf
86c0df077a
Create dict_check.phpt
2015-08-07 11:34:57 -03:00
marcosptf
196f02d42c
Create dict_add_to_session.phpt
2015-08-07 11:34:25 -03:00
marcosptf
b2976db7a5
Create dict_add_to_personal.phpt
2015-08-07 11:33:51 -03:00
marcosptf
d0bbbbabcf
Create broker_set_ordering.phpt
2015-08-07 11:33:03 -03:00
marcosptf
a0896433c0
Create broker_request_dict_01.phpt
2015-08-07 11:32:29 -03:00
marcosptf
92e525d1b6
Create broker_list_dicts.phpt
2015-08-07 11:31:25 -03:00
marcosptf
ba018d85cd
Create broker_get_error.phpt
2015-08-07 11:30:15 -03:00
marcosptf
6430f5dfd5
Rename broker_free.phpt to broker_free_01.phpt
2015-08-07 11:29:16 -03:00
marcosptf
1dd428afd2
Create broker_dict_exists.phpt
2015-08-07 11:25:33 -03:00
Christoph M. Becker
e8d1ef56ff
Merge branch 'pull-request/1460'
...
* pull-request/1460:
Update UPGRADING about new substr() behavior
2015-08-07 15:05:27 +02:00
Anatol Belski
07f8845205
fix datatype
2015-08-07 10:12:20 +02:00
Nicolas Grekas
948bb1aa26
Update UPGRADING about new substr() behavior
2015-08-07 09:12:02 +02:00
Ferenc Kovacs
0de4e57cce
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix NEWS
2015-08-07 08:47:21 +02:00
Christoph M. Becker
3f242f1f89
fixed mixed up NEWS entries
2015-08-06 19:04:51 +02:00
Dmitry Stogov
6fc358241b
Use specialized efree_size()
2015-08-06 18:04:17 +03:00
Rodrigo Prado
6bd3ace67e
Check the function UConverter::getAvailable with parameter wrong
2015-08-06 00:10:37 -03:00
Bob Weinand
ad4d139f29
Make bin2hex() and hex2bin() timing safe
2015-08-04 22:07:13 +02:00
Xinchen Hui
d0bea17d2e
Improve the conditions(save one comparison)
2015-07-15 10:55:41 +08:00
Xinchen Hui
32a4507abc
Fixed segfault if opcache is disabled and with file_cache
2015-07-15 10:38:23 +08:00
Xinchen Hui
453ec91dfe
Fixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T)
2015-07-14 18:59:36 +08:00
Lior Kaplan
ad929bf68b
Format alignment (needed for news2html)
2015-07-14 12:00:26 +03:00
Lior Kaplan
a3fea0568b
Format alignment (needed for news2html)
2015-07-14 11:28:53 +03:00
Christoph M. Becker
80b6a13553
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #53840 : Misleading extension entries in php.ini
2015-07-14 10:11:50 +02:00
Christoph M. Becker
72554891e3
Fix #53840 : Misleading extension entries in php.ini
...
As of PHP 5.3.0 the php_pspell.dll is not delivered anymore with the Windows
binaries, and according to bug #47464 that's highly unlike to change. So it's
appropriate to remove the respective extension entry from php.ini.
2015-07-14 10:09:29 +02:00
Christoph M. Becker
9f4135ad80
Merge branch 'master' of http://git.php.net/repository/php-src
...
# By Bob Weinand (5) and others
# Via Bob Weinand
* 'master' of http://git.php.net/repository/php-src :
We want to track phpdbg bugs in official bug tracker now; updated URL
Show also runtime-bound functions/classes/methods with phpdbg -p
One less comparison
Fix potential segfault
Closures only have {closure}() as method name Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
Fix __METHOD__ in functions nested into methods
Init variable to NULL before passing to zpp
Format alignment
PHP 7 OCI8: fix bug57702.phpt regression
2015-07-14 10:02:25 +02:00
Bob Weinand
50866846c4
We want to track phpdbg bugs in official bug tracker now; updated URL
2015-07-14 08:31:44 +02:00
Bob Weinand
762c6dd666
Show also runtime-bound functions/classes/methods with phpdbg -p
2015-07-14 06:28:53 +02:00
Rasmus Lerdorf
611ff0c846
One less comparison
2015-07-13 19:44:51 -07:00
Rasmus Lerdorf
1ce4e8c45e
Fix potential segfault
2015-07-13 19:38:55 -07:00
Bob Weinand
bce9368dfb
Closures only have {closure}() as method name
...
Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
2015-07-14 02:52:09 +02:00
Bob Weinand
1003d01f3a
Fix __METHOD__ in functions nested into methods
2015-07-14 02:37:35 +02:00
Bob Weinand
07c425cc29
Init variable to NULL before passing to zpp
2015-07-14 01:56:05 +02:00
Lior Kaplan
51ce31e0c4
Format alignment
2015-07-14 02:43:11 +03:00
Christopher Jones
c20f00f765
PHP 7 OCI8: fix bug57702.phpt regression
2015-07-14 08:39:59 +10:00
Christoph M. Becker
ae5d04cd6a
Merge branch 'master' of http://git.php.net/repository/php-src
...
# By Anatol Belski
# Via Anatol Belski
* 'master' of http://git.php.net/repository/php-src :
remove #ifdef
remove comment, it's not right
2015-07-14 00:30:17 +02:00
Anatol Belski
9db46a392b
remove #ifdef
2015-07-14 00:12:35 +02:00
Anatol Belski
b19aea3742
remove comment, it's not right
2015-07-13 23:43:43 +02:00
Christoph M. Becker
cdf4d35e30
Merge branch 'master' of http://git.php.net/repository/php-src
...
# By Christoph M. Becker (6) and others
* 'master' of http://git.php.net/repository/php-src :
updated NEWS
updated NEWS
Fix #66882 : imagerotate by -90 degrees truncates image by 1px
update NEWS
Fixed bug #70065 curl_getinfo() returns corrupted values
Revert SplFileInfo BC break while keeping fix for assertion removal
Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character
updated NEWS
updated NEWS
Fix #70064 : imagescale(..., IMG_BICUBIC) leaks memory
2015-07-13 22:39:12 +02:00
Christoph M. Becker
e9eee76840
updated NEWS
2015-07-13 22:33:43 +02:00
Christoph M. Becker
20eaa186fb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #66882 : imagerotate by -90 degrees truncates image by 1px
2015-07-13 22:30:43 +02:00
Christoph M. Becker
140e80acc0
updated NEWS
2015-07-13 22:29:10 +02:00
Christoph M. Becker
2e34febb73
Fix #66882 : imagerotate by -90 degrees truncates image by 1px
...
Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.
There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.
2015-07-13 22:18:56 +02:00
Christoph M. Becker
36439cf7b8
Fix #66882 : imagerotate by -90 degrees truncates image by 1px
...
Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.
There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.
2015-07-13 22:14:13 +02:00
Anatol Belski
961fb9b569
update NEWS
2015-07-13 21:48:45 +02:00
Anatol Belski
cefd010739
Fixed bug #70065 curl_getinfo() returns corrupted values
2015-07-13 21:47:42 +02:00
Anthony Ferrara
21686f1b30
Revert SplFileInfo BC break while keeping fix for assertion removal
...
This reverts the minor bc-break where .test would return an empty extension. This is different from 5.x's behavior.
In 7, it would result in an assertion failure crash. The fix for the removal of this assertion is kept, keeping BC with 5.x.
2015-07-13 13:27:06 -04:00
Anthony Ferrara
4b78636f3f
Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character
...
Currently, there is an assert() that fails on files like .gitignore crashing PHP. This patch fixes that.
Instead, now an empty string is returned (since the file has no extension). A test has been added to test this behavior.
2015-07-13 13:12:45 -04:00
Christoph M. Becker
e10e0a02aa
updated NEWS
2015-07-13 18:39:11 +02:00
Christoph M. Becker
fabc1b7174
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #70064 : imagescale(..., IMG_BICUBIC) leaks memory
2015-07-13 18:36:15 +02:00
Christoph M. Becker
72c2fc44e0
updated NEWS
2015-07-13 18:34:40 +02:00
Christoph M. Becker
1a4722a89e
Fix #70064 : imagescale(..., IMG_BICUBIC) leaks memory
...
A temporary image (tmp_im) is created with gdImageTrueColor() and freed with
gdFree() instead of gdImageDestroy(). Let's fix that.
2015-07-13 18:30:33 +02:00
Christoph M. Becker
2a2d3e88e6
Merge branch 'master' of http://git.php.net/repository/php-src
...
# By Christoph M. Becker (3) and Bob Weinand (2)
* 'master' of http://git.php.net/repository/php-src :
updated NEWS
updated NEWS
Fix #69024 : imagescale segfault with palette based image
Fix weird asm instruction order with gcc by marking as volatile in phpdbg
Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
2015-07-13 17:50:26 +02:00
Christoph M. Becker
54b288ad92
updated NEWS
2015-07-13 15:59:40 +02:00
Christoph M. Becker
959b2c3514
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #69024 : imagescale segfault with palette based image
2015-07-13 15:56:39 +02:00
Christoph M. Becker
25e5c8ac31
updated NEWS
2015-07-13 15:54:57 +02:00
Christoph M. Becker
fa53d8463f
Fix #69024 : imagescale segfault with palette based image
...
imagescale(..., IMG_BICUBIC) is not supposed to work with palette images, so we
fix that by converting to true color if necessary. Basically the same fix has
already been applied to the external libgd[1].
[1] <https://github.com/libgd/libgd/commit/723ea520bed3b5854df87393c687323d3930edf3 >
2015-07-13 15:48:48 +02:00
Christoph M. Becker
bccbd2df21
Fix #69024 : imagescale segfault with palette based image
...
imagescale(..., IMG_BICUBIC) is not supposed to work with palette images, so we
fix that by converting to true color if necessary. Basically the same fix has
already been applied to the external libgd[1].
[1] <https://github.com/libgd/libgd/commit/723ea520bed3b5854df87393c687323d3930edf3 >
2015-07-13 15:43:16 +02:00
Bob Weinand
3f10eddd1d
Fix weird asm instruction order with gcc by marking as volatile in phpdbg
2015-07-13 14:12:53 +02:00
Bob Weinand
82b1e22b57
Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
2015-07-13 14:12:45 +02:00
Christoph M. Becker
e990c809bb
Merge branch 'master' of http://git.php.net/repository/php-src
...
# By Xinchen Hui (5) and others
# Via Xinchen Hui (6) and others
* 'master' of http://git.php.net/repository/php-src :
Revert "Fixed test fail in travis from time to time"
Fixed test fail in travis from time to time
Update NEWS
Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining)
Fixed Bug #70058 Build fails when building for i386
Some OCI8 fixes (Rajendra)
Updated zend_update_static_property
updated NEWS
updated NEWS
Fix #53154 : Zero-height rectangle has whiskers
Fix #70048 : When running a phpinfo(), if you have a very long cell value you got a table overflow.
Hint label lookup table initialization branch on GOTO VM kind.
adding scenario of test to improve test coverage
Added php tests to improve extension coverage
2015-07-13 13:59:33 +02:00
Xinchen Hui
420b745a05
Merge branch 'shmop-extension_improve-test-coverage' of https://github.com/edgarsandi/php-src
2015-07-13 19:12:18 +08:00
Xinchen Hui
646694529f
Merge branch 'basename-function_improve-test-coverage' of https://github.com/edgarsandi/php-src
2015-07-13 19:08:25 +08:00
Xinchen Hui
833e4ced87
Merge branch 'goto_branch_hint' of https://github.com/bogdanandone/php-src
2015-07-13 19:07:11 +08:00
Xinchen Hui
5384ccf5bb
Revert "Fixed test fail in travis from time to time"
...
Some tests rely on this warning... :<
This reverts commit aed4c03cf9 .
2015-07-13 17:22:34 +08:00
Xinchen Hui
8c2658ed52
Merge branch 'master' of https://github.com/Geolim4/php-src
2015-07-13 16:40:56 +08:00
Xinchen Hui
aed4c03cf9
Fixed test fail in travis from time to time
2015-07-13 16:36:19 +08:00
Xinchen Hui
3b170531c4
Update NEWS
2015-07-13 16:24:54 +08:00
Xinchen Hui
e5a996f268
Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining)
2015-07-13 16:22:55 +08:00
Xinchen Hui
eef41c57a3
Merge branch 'zend_update_static_property' of https://github.com/dreamsxin/php-src
2015-07-13 16:02:21 +08:00
Xinchen Hui
b8eff44b0e
Fixed Bug #70058 Build fails when building for i386
...
(I don't have a m32 build env, so this is not tested)
2015-07-13 15:05:04 +08:00
Christopher Jones
8586e67c1c
Some OCI8 fixes (Rajendra)
2015-07-13 11:50:00 +10:00
Dreamsxin
7554e83037
Updated zend_update_static_property
2015-07-13 08:42:18 +08:00
Christopher Jones
a846ff5d52
Merge branch 'master' of https://git.php.net/repository/php-src
2015-07-13 09:56:00 +10:00
Christoph M. Becker
1d16d106f4
updated NEWS
2015-07-13 01:50:09 +02:00
Christoph M. Becker
42d1fa29c7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #53154 : Zero-height rectangle has whiskers
2015-07-13 01:46:09 +02:00
Christoph M. Becker
2939bce9f3
updated NEWS
2015-07-13 01:41:46 +02:00
Christoph M. Becker
094decc3c0
Fix #53154 : Zero-height rectangle has whiskers
...
To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.
2015-07-13 01:33:00 +02:00
Christoph M. Becker
d87a3312e3
Fix #53154 : Zero-height rectangle has whiskers
...
To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.
2015-07-13 01:29:01 +02:00
Christoph M. Becker
ecd32e437e
Merge branch 'master' of http://git.php.net/repository/php-src
...
* 'master' of http://git.php.net/repository/php-src :
updated NEWS
updated NEWS
Fix #67447 : imagecrop() adds a black line when cropping
2015-07-13 00:33:18 +02:00
Christoph M. Becker
33da8a60d9
updated NEWS
2015-07-12 23:18:59 +02:00
Christoph M. Becker
930a9910d7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #67447 : imagecrop() adds a black line when cropping
2015-07-12 23:15:06 +02:00
Christoph M. Becker
591fd4cdc3
updated NEWS
2015-07-12 23:13:13 +02:00
Christoph M. Becker
891ff131ef
Fix #67447 : imagecrop() adds a black line when cropping
...
A simple one-off error: imagecrop)() copied only width-1 and height-1 pixels.
2015-07-12 23:05:53 +02:00
Christoph M. Becker
0002f18af6
Merge branch 'master' of http://git.php.net/repository/php-src
...
# By Christoph M. Becker (3) and Tjerk Meesters (1)
# Via Christoph M. Becker (1) and Tjerk Meesters (1)
* 'master' of http://git.php.net/repository/php-src :
Fixed #70053 MutlitpleIterator array-keys incompatible change in PHP 7
updated NEWS
updated NEWS
Fix #68714 : copy 'n paste error
2015-07-12 19:06:09 +02:00
Tjerk Meesters
03d18d9a52
Fixed #70053 MutlitpleIterator array-keys incompatible change in PHP 7
2015-07-13 00:33:55 +08:00
Christoph M. Becker
fcdf1d0527
updated NEWS
2015-07-12 16:43:38 +02:00
Christoph M. Becker
ce7b5af03f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #68714 : copy 'n paste error
2015-07-12 16:39:50 +02:00
Christoph M. Becker
c0ac51dc07
updated NEWS
2015-07-12 16:38:23 +02:00
Christoph M. Becker
ba7c3a1bb4
Fix #68714 : copy 'n paste error
...
Actually, this is not really a bug fix, but rather a simplification and
optimization in the same vein as has been done with the external libgd, but
going a small step further and joining both for loops.
2015-07-12 16:32:38 +02:00
Christoph M. Becker
3aad9bd3ee
Fix #68714 : copy 'n paste error
...
Actually, this is not really a bug fix, but rather a simplification and
optimization in the same vein as has been done with the external libgd, but
going a small step further and joining both for loops.
2015-07-12 16:26:16 +02:00
Christoph M. Becker
a50dda901c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added XFAIL test for bug #53640
2015-07-12 00:12:31 +02:00
Christoph M. Becker
a8dbe655e5
Added XFAIL test for bug #53640
2015-07-12 00:10:56 +02:00
Geolim4
c10c47ae1e
Fix #70048 : When running a phpinfo(), if you have a very long cell value you got a table overflow.
2015-07-11 21:44:23 +02:00
Christoph M. Becker
649fd428d9
updated NEWS
2015-07-11 21:03:40 +02:00
Christoph M. Becker
77cd79012e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #66339 : PHP segfaults in imagexbm
2015-07-11 21:01:01 +02:00
Christoph M. Becker
bac1fe7438
updated NEWS
2015-07-11 20:58:50 +02:00
Christoph M. Becker
c40f40656e
Fix #66339 : PHP segfaults in imagexbm
...
The file parameter of the XBM image ZPP is not properly taken into account. If
it is NULL that would result in a segfault, because gdImageXbmCtx() is not
prepared to take a NULL file_name. If it is not NULL the XBM data would be
written to STDOUT, because the stream is not initialized. This patch fixes both
issues.
2015-07-11 20:54:07 +02:00
Christoph M. Becker
1a94e51859
updated NEWS
2015-07-11 17:56:33 +02:00
Christoph M. Becker
6f574c6dd8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #70047 : gd_info() doesn't report WebP support
2015-07-11 17:52:22 +02:00
Christoph M. Becker
6ac4c57f72
updated NEWS
2015-07-11 17:50:42 +02:00
Christoph M. Becker
450fbdc740
Fix #70047 : gd_info() doesn't report WebP support
...
Despite being documented, the array returned by gd_info() doesn't have a 'WebP
Support' key. This patch adds it.
2015-07-11 17:49:13 +02:00
Xinchen Hui
e63c756c09
Better implementation
2015-07-11 18:59:09 +08:00
Christoph M. Becker
0cd9c4eb2b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adding tests for getprotobyname and getprotobynumber functions
2015-07-11 00:20:46 +02:00
Rasmus Lerdorf
1af1afdfdc
DOMDocument::saveXML has a 2nd optional arg
2015-07-10 15:17:06 -07:00
Edgar R. Sandi
49c0c1299a
Adding tests for getprotobyname and getprotobynumber functions
2015-07-11 00:16:42 +02:00
Bob Weinand
0584df0ad9
hmm, we do not need the nop after compilation, so does not matter for opcache...
2015-07-10 23:35:05 +02:00
Bob Weinand
56800e470b
a: try { ... } ≠ try { a: ... }
2015-07-10 23:29:07 +02:00
Ferenc Kovacs
ed62db9abc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add missing NEWS entry
2015-07-10 17:26:09 +02:00
Ferenc Kovacs
a7dc1274f0
add missing NEWS entry
2015-07-10 17:25:44 +02:00
Xinchen Hui
8e709d7f5d
Fixed invalid read (Part issue of #69579 )
2015-07-10 22:26:53 +08:00
Nikita Popov
25d327e53f
Move try/catch/finally tests to common directory
2015-07-10 13:35:14 +02:00
Nikita Popov
725fed4902
Mark temporary_cleaning_006.phpt as XFAIL
...
And adjust it to fail even with opcode.
2015-07-10 13:33:32 +02:00
Nikita Popov
bd72fdca98
Better opcode dump for finally
...
* Move opcode decode into opline decode, so we can adjust it for
extended_value.
* Show extended_value and secondary jump ops for FAST_CALL and
FAST_RET.
2015-07-10 11:39:54 +02:00
Xinchen Hui
95ff2852ee
Micro optimization
2015-07-10 16:39:21 +08:00
Xinchen Hui
f930d6ea0e
Fixed Bug #69996 (Changing the property of a cloned object affects the original)
2015-07-10 16:33:13 +08:00
Bogdan Andone
e27cbe6542
Hint label lookup table initialization branch on GOTO VM kind.
...
This initialization is performed only once so it shall be marked as unexpected.
2015-07-10 11:18:40 +03:00
Xinchen Hui
54305c8952
Fixed No 2 issue in #1400
2015-07-10 16:04:45 +08:00
Xinchen Hui
a3f05d640d
Fixed Issue #1400 (double free static property)
2015-07-10 15:27:06 +08:00
Dmitry Stogov
ef1b588f6a
Resolve GOTO at compile time and replace it with sequnce of FREE/FE_FREE and JMP.
2015-07-10 04:44:21 +03:00
Dmitry Stogov
44f7348caa
Exception thrown by "return" statement (from TMP destructors) shouldn't be caught in the same function
2015-07-10 04:13:34 +03:00
Dmitry Stogov
3bb70fe290
Readded tests
2015-07-10 03:46:57 +03:00
Dmitry Stogov
bafe9d8c30
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
add missing NEWS entry
PDO_OCI LOB fixes (Senthil)
Improve test portability (Senthil)
Add new test section. Diff with query 5 is still to be resolved
Add Oracle syntax (Senthil)
2015-07-10 03:32:46 +03:00
Dmitry Stogov
549e8c4959
Squashed commit of the following:
...
commit 03cf871f1576f08b2348c141b209894a7bf17a86
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:45:31 2015 +0300
Revert "Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)"
This reverts commit 5ee8413259 .
commit 285a68227ce3d380e821a24fa389aa5239bd3fe1
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:45:26 2015 +0300
Revert "Tuned off dubugging of live ranges"
This reverts commit 404dc93d35 .
commit 93d9d11157301ee2ec99afb6f5744b126d17f637
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:45:17 2015 +0300
Revert "Remove loop_var_stack"
This reverts commit b3a4c05071 .
commit ede68ebbc284aec79e3f719f2c8dbf9da6907752
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:45:12 2015 +0300
Revert "ZEND_SEPARATE reuses temporaries"
This reverts commit 1852f538b9 .
commit 96d8995dc1f517fb01b481736273767509f76c47
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:45:10 2015 +0300
Revert "Add assertion in liveliness computation"
This reverts commit ed14019e8c .
commit 0649d7bfef152e6cc8e67b922534e9946c634d9c
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:45:07 2015 +0300
Revert "Fixed invalid live-range detection"
This reverts commit 54f367ee2a .
commit dfe8f3851f6b04595eb089323e3492115a59363e
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:45:04 2015 +0300
Revert "Add test guaranteeing that loop vars are only freed after potential return type exceptions"
This reverts commit f5db5a558d .
commit 52a94aad6f48a199358cc07f7e4f56bb73050504
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:45:01 2015 +0300
Revert "Fixed exception habdling on "return" statement."
This reverts commit 17c5315bdf .
commit 6e90ad7331901711e89c2ceb2bcab5023e5cee60
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:44:58 2015 +0300
Revert "Fix too early terminated temporary range with break/cont/goto"
This reverts commit cc876c04b4 .
commit 7b766e44b1970e4031f75109c302c07ead2c05cb
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 10 02:44:55 2015 +0300
Revert "Fixed exception catching on break/continue"
This reverts commit 8c3f701eeb .
2015-07-10 03:31:52 +03:00
Ferenc Kovacs
bf09c28aca
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add missing NEWS entry
2015-07-10 02:31:16 +02:00
Ferenc Kovacs
ec25f69c5d
add missing NEWS entry
2015-07-10 02:30:29 +02:00
Christopher Jones
bcb1c2fe03
PDO_OCI LOB fixes (Senthil)
2015-07-10 09:55:36 +10:00
Christopher Jones
268a333232
Improve test portability (Senthil)
2015-07-10 09:53:45 +10:00
Christopher Jones
e79433743a
Add new test section. Diff with query 5 is still to be resolved
2015-07-10 09:49:10 +10:00
Christopher Jones
a3c54dd1b7
Add Oracle syntax (Senthil)
2015-07-10 09:47:45 +10:00
Nikita Popov
a49ce7bb91
Don't return T_ERROR from token_get_all()
...
This turned out to be rather inconvenient after all. Instead just
return the same output we did on PHP 5. If people want to have an
error, use TOKEN_PARSE.
2015-07-09 23:02:21 +02:00
Anatol Belski
fc5c7e633b
refix the NEWS
2015-07-09 22:56:11 +02:00
Dmitry Stogov
8c3f701eeb
Fixed exception catching on break/continue
...
Fixed "finaly" handling on exception in "return" statement
2015-07-09 23:20:50 +03:00
Edgar R. Sandi
28c3b55fa8
adding scenario of test to improve test coverage
2015-07-09 16:43:31 -03:00
Nikita Popov
788c4c852d
Fix posix_setrlimit segfault
2015-07-09 20:40:07 +02:00
Bob Weinand
cc876c04b4
Fix too early terminated temporary range with break/cont/goto
...
I have no crashing or leaking reproduce script, only valgrind invalid reads for that one; hence no phpt here
2015-07-09 20:07:57 +02:00
Ferenc Kovacs
9591b1cc3c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
move the use-after-free fixes to 5.6.11
2015-07-09 20:02:18 +02:00
Ferenc Kovacs
ab66152c68
move the use-after-free fixes to 5.6.11
2015-07-09 20:01:37 +02:00
Dmitry Stogov
17c5315bdf
Fixed exception habdling on "return" statement.
...
Such exceptions shouldn't be caught in the same function.
2015-07-09 20:47:25 +03:00
Nikita Popov
d91aad5966
Fix bug #69430
...
Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors
are reported as T_ERROR tokens.
2015-07-09 19:11:48 +02:00
Nikita Popov
8abc3022b0
Update token_get_all() arginfo
2015-07-09 18:19:12 +02:00
Bob Weinand
f5db5a558d
Add test guaranteeing that loop vars are only freed after potential return type exceptions
2015-07-09 16:54:41 +02:00
Dmitry Stogov
54f367ee2a
Fixed invalid live-range detection
2015-07-09 17:38:29 +03:00
Dmitry Stogov
b77fa94cf9
Disable opcache.fast_shutdown if USE_ZEND_ALLOC=0
2015-07-09 12:19:51 +03:00
Dmitry Stogov
225bb70498
Added missing API functions
2015-07-09 12:19:30 +03:00
Xinchen Hui
0de0c4ace1
Fixed Bug #70032 (make_http_soap_request calls zend_hash_get_current_key_ex(,,,NULL))
2015-07-09 16:36:31 +08:00
Magnus Määttä
a55ca9a8d1
Fix posix_setrlimit() to use int as values instead of strings.
...
Add constant for unlimited (POSIX_RLIMIT_INFINITY).
2015-07-09 00:04:13 +02:00
Magnus Määttä
963d906aff
Add posix_setrlimit() FR #54603
2015-07-08 22:12:07 +02:00
Dmitry Stogov
301ee26568
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected).
...
CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE().
As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 18:33:58 +03:00
Julien Pauli
993a658ada
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.5.27 release
2015-07-08 17:00:47 +02:00
Julien Pauli
b1a9b89773
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.27 release
Conflicts:
main/php_version.h
2015-07-08 17:00:29 +02:00
Julien Pauli
34b624f122
5.5.27 release
2015-07-08 16:59:44 +02:00
Bob Weinand
3ccc17cee5
Working fix for ctrl+d on readline/libedit
2015-07-08 16:54:41 +02:00
Xinchen Hui
5460929077
Merge branch 'PHP-5.6'
2015-07-08 22:35:10 +08:00
Xinchen Hui
c75d245e82
Revert "Fixed invalid read"
...
I must be confused while switching from master to 5.6
This reverts commit 94957a7091 .
2015-07-08 22:34:27 +08:00
Xinchen Hui
ffccf19fa6
Merge branch 'master' of git.php.net:php-src
2015-07-08 19:31:36 +08:00
Xinchen Hui
da333bfbd8
Fixed bug #70018 (exec does not strip all whitespace)
...
Merge branch 'PHP-5.6'
Conflicts:
ext/standard/exec.c
2015-07-08 19:30:58 +08:00
Anatol Belski
dd1f0940fe
fix NEWS
2015-07-08 13:27:34 +02:00
Xinchen Hui
94957a7091
Fixed invalid read
2015-07-08 19:19:37 +08:00
Xinchen Hui
f9dc60f36f
Merge branch 'master' of git.php.net:php-src
2015-07-08 18:25:04 +08:00
Xinchen Hui
b9e48073b3
Make sure fast_call_var is initialized properly
2015-07-08 18:24:27 +08:00
Nikita Popov
ed14019e8c
Add assertion in liveliness computation
...
Assert that a live-range does not start, while one for the same
variable is already active.
To satisfy this constraint, explicitly exclude writes from JMP_SET
and COALESCE. They were previously also handled correctly, because
their result variable was only killed after the second write to it
after the false branch. This just makes it more explicit.
2015-07-08 12:00:39 +02:00
Xinchen Hui
249915f938
Add comment to explaining the new check
2015-07-08 17:44:54 +08:00
Xinchen Hui
3b5876916d
Remove outdate comment
2015-07-08 17:42:50 +08:00
Xinchen Hui
c6037bd3af
Fixed bug #70012 (Exception lost with nested finally block)
2015-07-08 17:15:09 +08:00
Xinchen Hui
6154fc77be
Merge branch 'PHP-5.6'
2015-07-08 17:14:32 +08:00
Xinchen Hui
ca30d5bf39
Fixed bug #70012 (Exception lost with nested finally block)
2015-07-08 17:14:19 +08:00
Aaron Piotrowski
1c7619491e
Fix failing tests from exception code changes
2015-07-07 23:14:05 -05:00
Kalle Sommer Nielsen
b84363f7fa
PHP 7.0.0 Beta 2 NEWS
2015-07-08 02:37:59 +02:00
Nikita Popov
1852f538b9
ZEND_SEPARATE reuses temporaries
2015-07-08 00:13:23 +02:00
Stanislav Malyshev
496f291f3d
5.4.44 next
2015-07-07 15:07:28 -07:00
Aaron Piotrowski
a1a83bf5f0
Switch code on thrown TypeError and ParseError to 0, update related tests
2015-07-07 16:54:39 -05:00
Christoph M. Becker
dbadf447b2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed typo in test for bug #66985
2015-07-07 23:39:18 +02:00
Christoph M. Becker
e68b5252a2
fixed typo in test for bug #66985
2015-07-07 23:35:28 +02:00
Bob Weinand
7a8ea0f60d
Properly exit on EOF on stdin in readline mode
2015-07-07 22:45:34 +02:00
Nikita Popov
b3a4c05071
Remove loop_var_stack
...
Instead add a loop_var member to brk_cont_element. Now that
brk_cont is compile-time the distinction is no longer necessary.
Also drops brk_cont.start, check the loop_var op_type instead.
2015-07-07 20:55:12 +02:00
Rasmus Lerdorf
40ca0f1927
SQLite3::open/__construct has 2 optional args
2015-07-07 11:53:07 -07:00
Stanislav Malyshev
a5e7075d79
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Better fix for bug #69958
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/mysqlnd/mysqlnd.c
ext/phar/phar_object.c
2015-07-07 10:19:20 -07:00
Stanislav Malyshev
2d0771d66c
Better fix for bug #69958
2015-07-07 10:18:22 -07:00
Stanislav Malyshev
3bee16a70a
Better fix for bug #69958
2015-07-07 10:17:54 -07:00
Stanislav Malyshev
d8aa5675ad
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
2015-07-07 10:16:54 -07:00
Stanislav Malyshev
12ff95574b
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
2015-07-07 10:15:41 -07:00
Stanislav Malyshev
00f177a5ed
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
2015-07-07 10:15:41 -07:00
Stanislav Malyshev
6c884e8e84
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Better fix for bug #69958
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/phar/phar_object.c
2015-07-07 10:12:51 -07:00
Aaron Piotrowski
5df893ce3c
Use NULL where possible for exception class
...
Matches usage of zend_throw_exception()/zend_throw_exception_ex().
2015-07-07 12:10:55 -05:00
Aaron Piotrowski
29c3cd4448
Allow NULL for exception_ce
2015-07-07 12:10:55 -05:00
Stanislav Malyshev
b4b082e63e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/mysqlnd/mysqlnd.c
2015-07-07 10:09:34 -07:00
Stanislav Malyshev
545eddba93
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
add missing second argument for ucfirst to the proto
2015-07-07 10:08:37 -07:00
Anatol Belski
54bcc6280c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix C89 compat
2015-07-07 18:40:16 +02:00
Anatol Belski
c0142de470
fix C89 compat
2015-07-07 18:39:33 +02:00
Stanislav Malyshev
885edfef0a
Better fix for bug #69958
2015-07-07 09:38:31 -07:00
Stanislav Malyshev
c8157619ef
update news
2015-07-07 09:38:31 -07:00
Stanislav Malyshev
97aa752fee
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
2015-07-07 09:38:31 -07:00
Stanislav Malyshev
6dedeb40db
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
2015-07-07 09:38:31 -07:00
Stanislav Malyshev
bf58162ddf
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
2015-07-07 09:38:30 -07:00
Kalle Sommer Nielsen
fe842a8510
fix C89 compat
2015-07-07 18:26:14 +02:00
Anatol Belski
aaee58ecc4
added info about the user space stream context for pipes
2015-07-07 17:11:24 +02:00
Anatol Belski
4bf70f4d98
mention pcre.jit in the supplied php.ini-*
2015-07-07 16:15:56 +02:00
Julien Pauli
bcd6bc46f4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix test related to c22da81
Conflicts:
ext/standard/tests/general_functions/bug41037.phpt
2015-07-07 16:03:37 +02:00
Julien Pauli
4c34d57414
Fix test related to c22da81
2015-07-07 16:01:44 +02:00
Edgar R. Sandi
18dfbf9008
Added php tests to improve extension coverage
2015-07-07 10:50:23 -03:00
Ferenc Kovacs
df499b9108
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add missing second argument for ucfirst to the proto
2015-07-07 15:50:02 +02:00
Ferenc Kovacs
bdb9c0da86
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add missing second argument for ucfirst to the proto
2015-07-07 15:49:44 +02:00
Ferenc Kovacs
b6f5cb11a4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add missing second argument for ucfirst to the proto
2015-07-07 15:49:16 +02:00
Ferenc Kovacs
29533ae528
add missing second argument for ucfirst to the proto
2015-07-07 15:48:55 +02:00
Xinchen Hui
015d20ab83
Merge branch 'master' of git.php.net:php-src
2015-07-07 21:40:46 +08:00
Xinchen Hui
9ae892ec93
Update NEWs
2015-07-07 21:38:37 +08:00
Xinchen Hui
ca1ba39102
Merge branch 'PHP-5.6'
...
Conflicts:
ext/sqlite3/sqlite3.c
2015-07-07 21:38:24 +08:00
Xinchen Hui
26471eb69c
Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())
2015-07-07 21:37:35 +08:00
Anatol Belski
a94b3b8e64
updated NEWS
2015-07-07 15:34:37 +02:00
Xinchen Hui
5bd315657c
Update NEWs
2015-07-07 21:29:20 +08:00
Xinchen Hui
fff374feba
Merge branch 'PHP-5.6'
...
Conflicts:
ext/spl/spl_iterators.c
2015-07-07 21:28:51 +08:00
Xinchen Hui
e41f600365
Fixed bug #69970 (Use-after-free vulnerability in spl_recursive_it_move_forward_ex())
2015-07-07 21:25:28 +08:00
Julien Pauli
dfb0c6363f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed double ZEND_TICKS opcode generation for declare()
Conflicts:
Zend/zend_compile.c
2015-07-07 15:03:58 +02:00
Julien Pauli
c22da81b71
Fixed double ZEND_TICKS opcode generation for declare()
2015-07-07 14:56:05 +02:00
Dmitry Stogov
404dc93d35
Tuned off dubugging of live ranges
2015-07-07 15:43:14 +03:00
Dmitry Stogov
5ee8413259
Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)
...
Squashed commit of the following:
commit 38e22106d4bdcc829dd2b64be1d3c6cdc089f3ed
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 15:12:19 2015 +0300
Added NEWS entry
commit 0a355935bfb10b5a4c893f4db9496ea8abbcf71b
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 15:06:32 2015 +0300
Inline function, to eliminate repeatable checks
commit d937584f3aef0baae6001377b61fd700b6f36e14
Merge: 0341626 32677f5
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 14:35:49 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Fixed bug #70006 (cli - function with default arg = STDOUT crash output).
Fix x86 build
Fixed use after free on closure_call_leak_with_exception.phpt
Fixed test
commit 0341626ea94a5e474c660732d33884460847d5e7
Merge: 74869fa dec35de
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 12:00:53 2015 +0300
Merge branch 'temporary_cleaning' of https://github.com/laruence/php-src into temporary_cleaning
* 'temporary_cleaning' of https://github.com/laruence/php-src :
Fixed checkpoint get
Fixed crash of invalid pointer derefer
cleanup
commit 74869fa67375b8daf772ac30b6b936fd2a2132c6
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 11:45:34 2015 +0300
Fixed wrong GOTO resolution
commit dec35ded3294e3022e88a623188c3d1d71381675
Author: Xinchen Hui <laruence@gmail.com >
Date: Tue Jul 7 15:58:49 2015 +0800
Fixed checkpoint get
commit b0f419540ad24c44810c9b05da046965618ffc65
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 10:47:11 2015 +0300
Fixed crash of invalid pointer derefer (laruence)
commit 7a428d98ca2899c5933914caa0cd17b4126e952c
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 10:35:47 2015 +0300
Fixed identation
commit 9c3a4dce9ce02034d19d28182aa9c1298d528daf
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 10:33:52 2015 +0300
Fixed invalid size
commit 653abc670b2a1f453b0fc3fc4a9eca919ee870cc
Author: Xinchen Hui <laruence@gmail.com >
Date: Tue Jul 7 11:29:14 2015 +0800
Fixed crash of invalid pointer derefer
commit e04500ceda606ac4f364d03bcd562327bdc74eee
Author: Xinchen Hui <laruence@gmail.com >
Date: Tue Jul 7 11:28:26 2015 +0800
cleanup
commit 34183e1687681038e77b650078927b35ee84e933
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 04:49:46 2015 +0300
op_array->T_liveliness compression
commit 2f6ad845795a08c3d7ac219e9c42950565b20394
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 04:44:44 2015 +0300
White spaces
commit be83f115a3f82a548c8d377c66574de5e5187410
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 04:42:26 2015 +0300
Identation
commit 1f5084b99038c374ac012b017c4d1652bb5d4222
Merge: 91b620d 1adf3df
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 04:41:54 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Throw TypeError for invalid callback
Fix crash when exception occurs during nested rope
Fix crash when exception is thrown during ROPE_END
Small cleanup in ternary compilation
move the define to the right place
fix ext/ldap build
Rectify information about invalid shift warning being now ArithmeticError
commit 91b620d684c5a2296774432d5d0ff8f5d14397d6
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 04:32:04 2015 +0300
Replace GOTO by FREE/FE_FREE and JMP at compile time
commit 7052e5697918fab83d2975977c3392f7188fbc87
Author: Dmitry Stogov <dmitry@zend.com >
Date: Tue Jul 7 02:25:08 2015 +0300
Use zend_regenerate_var_liveliness_info() to regenerate information after pass two.
commit ae72b0dc6797815a846b8f95abccb36367422d27
Merge: a81c4bb a919fe8
Author: Dmitry Stogov <dmitry@zend.com >
Date: Mon Jul 6 21:02:34 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Do not display EXT_TYPE_UNUSED in phpdbg opcodes
Run debug build with opcache on travis
commit a81c4bb8c6f1ba8124a5a7636694480ff0f1328c
Author: Dmitry Stogov <dmitry@zend.com >
Date: Mon Jul 6 20:59:34 2015 +0300
Improved algorithm. It's actually the same algorithm with second loop removed and simpler temporary data structures. The only difference may be in "re-defined" vatriable handling. Now live-range in that case started from the seconnd definition (this must be more safe).
commit 9a16810f7a7c10373603c5250d985616acf45e97
Merge: bbfbe47 001ecd3
Author: Dmitry Stogov <dmitry@zend.com >
Date: Mon Jul 6 17:57:45 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Simplify TMP var number decoding (without HashTable)
commit bbfbe470c865cb8b3cae8bf6518e6d06af525522
Merge: 0bda4ab 436b01e
Author: Dmitry Stogov <dmitry@zend.com >
Date: Mon Jul 6 17:02:01 2015 +0300
Merge branch 'master' into temporary_cleaning
* master:
Avoid dangerous optimization
Fixed JMPZNZ instruction printing
Attempt at falling back on ldap_find_control for Mac OS
commit 0bda4abea7ba0a51c2ec125edb547645d0329792
Author: Dmitry Stogov <dmitry@zend.com >
Date: Mon Jul 6 16:05:33 2015 +0300
Fixed live-range construction for OP_DATA opcode
Added comments about algorithm assumtions
commit 521ad9df98fdf1dd8b7c212799ddeb1a84483e6f
Merge: 4398dab a09dcb0
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Mon Jul 6 14:54:15 2015 +0200
Merge branch 'master' of https://github.com/php/php-src into temporary_cleaning
commit 4398dab82f9a5ce64df55b24988ce7d31e24074f
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Mon Jul 6 13:51:27 2015 +0200
Add a few phpt tests related to temporary cleaning
commit 739656f83ff5b570bb311d2c7cb2d72380a3c759
Author: Dmitry Stogov <dmitry@zend.com >
Date: Mon Jul 6 14:28:49 2015 +0300
Fixed Zend/tests/foreach_004.phpt failure (FE_FETCH shouldn't be included into TMP vatriablr live range)
commit 3df462a2bcf5fa8f9244ea299178152a5d436277
Author: Dmitry Stogov <dmitry@zend.com >
Date: Mon Jul 6 13:41:02 2015 +0300
Improve data layout (reduce the op_array structure size on 64-bit systems)
commit 883b73c56e6dab6489ae4cda2c1331b53a995586
Author: Dmitry Stogov <dmitry@zend.com >
Date: Mon Jul 6 13:28:45 2015 +0300
Removed op_array->brk_cont_array
commit ae5e58b59843513505e84e396c1446ac35cb1b94
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Mon Jul 6 04:22:58 2015 +0200
Fix bug with brk_cont variable free / free loop vars via temporary liveliness info
commit b4223ca62771e1003c9ab778a09a177ad71e6d57
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Mon Jul 6 04:07:07 2015 +0200
Fix bugs / cleanup fixes
commit ea33189d220c7fc0884848571635abe3cddd2f4d
Author: Xinchen Hui <laruence@gmail.com >
Date: Sun Jul 5 20:58:38 2015 +0800
Removed useless TsTop
commit 1dbb007e4addba9ac3bfc227db27a651cbcf5ede
Merge: 550bbf8 3a8af24
Author: Xinchen Hui <laruence@gmail.com >
Date: Sat Jul 4 15:06:44 2015 +0800
Merge branch 'temporary_cleaning' of https://github.com/dstogov/php-src into temporary_cleaning
commit 3a8af245290ceb507108340831254672f24022fa
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 3 16:15:36 2015 +0300
More exceptions from regular liveliness analyses (with explanation in comments).
Mark old "unexplained" exceptions with ???.
commit ba721efa2cbd2136668fec956ef3b034ac1a29d6
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 3 14:16:09 2015 +0300
Print list of live temp variables (at least for internal debugging)
commit 8d1f88fe91e62b4333703c58b871d85b66fb7b70
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 3 13:31:56 2015 +0300
Use op_array->T_liveliness to free incomplete ropes and restore error_reporting level on exception
commit 80c1d0d779e6e9609a211907838f3727aa7b301a
Author: Dmitry Stogov <dmitry@zend.com >
Date: Fri Jul 3 11:05:39 2015 +0300
Don't keep empty T_liveliness
commit 501ae8aaac0a92368b50e9f342b04d7334d263f6
Author: Dmitry Stogov <dmitry@zend.com >
Date: Thu Jul 2 22:31:48 2015 +0300
Reverted changes to Zend/zend_arena.h.
Reuse CG(arena) instead of creating a new one.
commit a4fce36907147df5ac1af78b44135e3f07c1844c
Merge: 6ff7246 fd0fcce
Author: Dmitry Stogov <dmitry@zend.com >
Date: Thu Jul 2 22:01:42 2015 +0300
Merge branch 'temporary_cleaning' of github.com:bwoebi/php-src into temporary_cleaning
* 'temporary_cleaning' of github.com:bwoebi/php-src:
Fix remaining issues with compacted temporaries
Fix regression from last commit (+1 ?!)
Fix off-by-one (opcache may remove last ZEND_RETURN)
Speed algorithm up, more fail safety when reusing temporaries
Dumb bug in opcode.c (forgot to update Ts[i])
Fix opcache support
Exempt ROPE temporaries from freeing
Hmm, we need temporary info for all the opcodes
Add opcache support for cleaning in optimization step (Opcache seems to have a few unrelated issues which blow up together with that patch)
Add proper temporary cleaning upon frame abortion
Fix arena on small sizes (size < sizeof(zend_arena))
commit fd0fcce81177717f3a05ac87192b5ed05eead0a1
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Thu Jul 2 20:00:33 2015 +0200
Fix remaining issues with compacted temporaries
commit 427dc58bbb93022d1c2077f874afcdb9dd82d5c5
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Wed Jul 1 22:49:12 2015 +0200
Fix regression from last commit (+1 ?!)
commit 1adcf56a6e9f09e7ad06331d4d6280035b17a7d1
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Wed Jul 1 22:17:07 2015 +0200
Fix off-by-one (opcache may remove last ZEND_RETURN)
commit 25b231b7841fa4078c65976cabdd843845a6cbe6
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Wed Jul 1 20:59:24 2015 +0200
Speed algorithm up, more fail safety when reusing temporaries
commit 22d9d05350e35d180018d0bccbad6f173cb4797d
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Wed Jul 1 16:48:46 2015 +0200
Dumb bug in opcode.c (forgot to update Ts[i])
commit 6538269bfa5bcbad34fc2f051b0fd5e4ebf2ff00
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Wed Jul 1 13:05:52 2015 +0200
Fix opcache support
commit 333a7c4a8813a45dc79ce55b8e9c0a0b98671e13
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Sat Jun 27 22:40:21 2015 +0200
Exempt ROPE temporaries from freeing
commit 02585f77085427baea48448c134a96c542af3337
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Fri Jun 26 16:20:55 2015 +0200
Hmm, we need temporary info for all the opcodes
commit cbcaedbd78199897e5cacffd700b706f21590abf
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Fri Jun 26 01:04:09 2015 +0200
Add opcache support for cleaning in optimization step
(Opcache seems to have a few unrelated issues which blow up together with that patch)
commit fef649f4067823a1f96f85340cf715e5877310bc
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Fri Jun 26 01:02:27 2015 +0200
Add proper temporary cleaning upon frame abortion
commit 1cec2e7271b789b84601f8acf385950af1bb0c7c
Author: Bob Weinand <bobwei9@hotmail.com >
Date: Thu Jun 25 23:33:21 2015 +0200
Fix arena on small sizes (size < sizeof(zend_arena))
2015-07-07 15:41:12 +03:00
Xinchen Hui
32677f568b
Merge branch 'master' of git.php.net:php-src
2015-07-07 19:21:54 +08:00
Xinchen Hui
7af4e6d02d
Fixed bug #70006 (cli - function with default arg = STDOUT crash output).
2015-07-07 19:21:02 +08:00
Kalle Sommer Nielsen
2bd4b18c24
Merge branch 'master' of https://git.php.net/push/php-src
2015-07-07 12:43:58 +02:00
Kalle Sommer Nielsen
0ac2371b5a
Fix x86 build
2015-07-07 12:41:05 +02:00
Xinchen Hui
333528089e
Fixed use after free on closure_call_leak_with_exception.phpt
2015-07-07 18:19:57 +08:00
Dmitry Stogov
636c16b186
Fixed test
2015-07-07 10:14:37 +03:00
Stanislav Malyshev
ed84af4b88
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Better fix for bug #69958
2015-07-07 00:01:42 -07:00
Stanislav Malyshev
eda31f57fb
Better fix for bug #69958
2015-07-07 00:01:26 -07:00
Stanislav Malyshev
09de64a58d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Better fix for bug #69958
2015-07-06 23:03:05 -07:00
Stanislav Malyshev
61b0b80388
Better fix for bug #69958
2015-07-06 22:58:28 -07:00
Stanislav Malyshev
485b7c6981
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update news
2015-07-06 21:53:02 -07:00
Stanislav Malyshev
c938d2f537
update news
2015-07-06 21:52:56 -07:00
Stanislav Malyshev
303d97feda
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/mysqlnd/mysqlnd.c
2015-07-06 21:52:49 -07:00
Stanislav Malyshev
0d2f147d80
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
2015-07-06 21:50:01 -07:00
Aaron Piotrowski
1adf3df81e
Throw TypeError for invalid callback
...
Matches behavior of zend_internal_type_error() if E_ERROR is passed to
zend_wrong_callback_error().
2015-07-06 15:03:35 -05:00
Nikita Popov
724051e3bd
Fix crash when exception occurs during nested rope
...
Adds extra condition that the rope var of INIT/ADD must match the
one one END.
2015-07-06 20:53:54 +02:00
Nikita Popov
89ce8d28de
Fix crash when exception is thrown during ROPE_END
...
The CHECK_EXCEPTION() was done at a point where the old opline is
still used, thus redirecting the write to the result var into
EX(call) instead.
Handling the exception in-place to avoid leaking result.
2015-07-06 20:15:45 +02:00
Nikita Popov
f3498783df
Small cleanup in ternary compilation
2015-07-06 20:15:45 +02:00
Anatol Belski
73c0fc0df4
move the define to the right place
...
thanks Kalle )
2015-07-06 19:43:35 +02:00
Anatol Belski
cb2d33f3e2
fix ext/ldap build
2015-07-06 19:35:29 +02:00
Bob Weinand
23242fd61d
Rectify information about invalid shift warning being now ArithmeticError
2015-07-06 18:09:36 +02:00
Bob Weinand
a919fe8606
Do not display EXT_TYPE_UNUSED in phpdbg opcodes
2015-07-06 18:05:03 +02:00
Bob Weinand
b3ab7c13dc
Run debug build with opcache on travis
2015-07-06 17:41:24 +02:00
Dmitry Stogov
001ecd3198
Simplify TMP var number decoding (without HashTable)
2015-07-06 17:56:48 +03:00
Dmitry Stogov
436b01e379
Avoid dangerous optimization
2015-07-06 16:52:38 +03:00
Dmitry Stogov
1a9f4f90da
Fixed JMPZNZ instruction printing
2015-07-06 16:30:50 +03:00
Côme Bernigaud
da6e286dbb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Attempt at falling back on ldap_find_control for Mac OS
2015-07-06 14:56:20 +02:00
Côme Bernigaud
022068342b
Attempt at falling back on ldap_find_control for Mac OS
2015-07-06 14:54:04 +02:00
Côme Bernigaud
a09dcb0e13
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated README, added test to create LDAP base if missing and ease tests
2015-07-06 14:28:01 +02:00
Anatol Belski
535b2cc02b
update NEWS about #69900
...
backport for 5.6 to go
2015-07-06 14:27:17 +02:00
Côme Bernigaud
42f7e4c044
Updated README, added test to create LDAP base if missing and ease tests
2015-07-06 14:26:49 +02:00
Dmitry Stogov
2f7b178fac
Fixed test (shift operators throw Error)
2015-07-06 12:28:14 +03:00
Dmitry Stogov
7a1a499377
Fixed return value
2015-07-06 11:25:19 +03:00
Xinchen Hui
5e7fd530ce
Merge branch 'signed_char' of https://github.com/antonblanchard/php-src
2015-07-06 15:36:55 +08:00
Xinchen Hui
84e07b08bd
Reorder the conditions
2015-07-06 15:24:51 +08:00
Xinchen Hui
ce550cefde
Fixed segfault while with generating ext info
2015-07-06 15:22:40 +08:00
Anton Blanchard
275009d0bd
http parser code assumes char is signed
...
A char can be either signed or unsigned, and on PowerPC and ARM it is
unsigned. The following code will always be false on these architectures:
if (c == -1) goto error;
2015-07-06 10:13:00 +10:00
Anatol Belski
a97f764472
bring back the division by zero warning
2015-07-05 20:18:17 +02:00
Stanislav Malyshev
b9d3540304
Merge branch 'pull-request/1368'
...
* pull-request/1368:
moved function warning test to money_format_error.phpt file
2015-07-05 01:24:35 -07:00
Stanislav Malyshev
013d1296d6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Cleaned white spaces in PHP_INI definition of phar
2015-07-05 01:10:29 -07:00
Dominic
b27bcd90b3
Cleaned white spaces in PHP_INI definition of phar
...
Removes unnecessary white spaces.
2015-07-05 01:10:22 -07:00
Stanislav Malyshev
9b6c3d19c5
Merge branch 'pull-request/1351'
...
* pull-request/1351:
Cleaned white spaces in PHP_INI definition of phar
2015-07-05 01:04:22 -07:00
Stanislav Malyshev
64eb8338b1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix typo, see #68476
2015-07-05 01:01:27 -07:00
Stanislav Malyshev
04ca04f830
Merge branch 'pull-request/1324' into PHP-5.6
...
* pull-request/1324:
fix typo, see #68476
2015-07-05 01:01:00 -07:00
Stanislav Malyshev
3e88d610e5
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
2015-07-04 23:47:48 -07:00
Stanislav Malyshev
452d30cf7d
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
2015-07-04 21:01:50 -07:00
Bob Weinand
56b6e0dd14
Fix use after free with opcache (interned strings)
2015-07-05 02:00:52 +02:00
Kalle Sommer Nielsen
12b79fcb05
This macro check is not needed (Anatol)
2015-07-04 21:21:15 +02:00
Kalle Sommer Nielsen
ce2cd89258
Replace references to PHP_WIN32 and TSRM_WIN32 with ZEND_WIN32 in Zend/, this also fixes 1 instance of where fflush(stderr) was misplaced (zend_extensions.c)
2015-07-04 18:55:22 +02:00
Xinchen Hui
550bbf8f46
Fixed bug #69983 (get_browser fails with user agent of null)
2015-07-04 11:05:50 +08:00
Aaron Piotrowski
1a0ddf988c
Switch code on thrown Errors to 0, update related tests
2015-07-03 17:53:42 -05:00
Aaron Piotrowski
fbcc823952
Remove E_EXCEPTION
2015-07-03 17:53:42 -05:00
Aaron Piotrowski
02623ddb82
Switch macro with __VA_ARGS__ to function
2015-07-03 17:53:41 -05:00
Aaron Piotrowski
22c38b2ef5
Remove need to pass error level
2015-07-03 17:53:41 -05:00
Aaron Piotrowski
5a99c07ecc
Enable throwing custom exceptions from errors
2015-07-03 17:53:40 -05:00
Nikita Popov
866bd89b1d
Always report object leaks
...
Previously cycles were excluded from leak reports, however the
situation here has improved a lot in the meantime and we can
report all leaks.
2015-07-03 19:33:34 +02:00
Nikita Popov
3c33854e7c
Don't leak generator cycle in ReflectionGenerator test
...
This is tracked by bug #69989 .
2015-07-03 19:33:28 +02:00
Aaron Piotrowski
ed1b64877d
Switch position of ce in exception ce variable names
2015-07-03 09:45:03 -05:00
Aaron Piotrowski
a812a74c2e
Change zend_exception_get_default() to zend_exception_ce
2015-07-03 09:44:48 -05:00
Aaron Piotrowski
f9e9d3a437
Cleanup exception ce API
...
Removed recently added functions to get Error ce's and marked the old functions
fetching default_exception_ce and error_exception_ce as deprecated.
2015-07-03 09:44:30 -05:00
Anatol Belski
9adfb053e6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix backport mistake
2015-07-03 16:22:01 +02:00
Anatol Belski
b281211979
fix backport mistake
...
in 5.6 it has to be explicitly copied to avoid double free
2015-07-03 16:21:02 +02:00
Christoph M. Becker
e75cf6b7e4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed fix #69975 wrt. ODBCVER < 0x0300
2015-07-03 13:32:05 +02:00
Christoph M. Becker
344ff5dd4c
fixed fix #69975 wrt. ODBCVER < 0x0300
2015-07-03 13:30:39 +02:00
Anatol Belski
02df0cb02b
improve info about the applink
2015-07-03 12:45:59 +02:00
Anatol Belski
9d9f372df6
added openssl applink shim note to UPGRADING.INTERNALS
2015-07-03 12:40:54 +02:00
Anatol Belski
274edb4c6f
add missing item in the content table
2015-07-03 12:40:53 +02:00
Anatol Belski
54e19fe7c3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
backport c01943bffc into 5.6
2015-07-03 11:17:16 +02:00
Anatol Belski
d870683d6b
backport c01943bffc into 5.6
2015-07-03 11:16:02 +02:00
Anatol Belski
c01943bffc
fix improper behavior
...
openssl_spki_export() is documented to return string, but it's
obviously not achieved writing it to stdout :)
2015-07-03 10:15:52 +02:00
Anatol Belski
3d7343f609
integrate the applink shim in the other bins
2015-07-03 07:11:14 +02:00
Anatol Belski
59444347d1
integrate the openssl applink shim
...
This fixes ext/openssl/tests/openssl_spki_export.phpt failing
with the no OPENSSL_Applink error. Applink is also an interesting
technique documented in the OpenSSL FAQ
https://www.openssl.org/support/faq.html#PROG2
which allows under circumstances using different OpenSSL binaries
than those a program was linked with.
2015-07-03 07:11:13 +02:00
Xinchen Hui
e8f992c163
Catch the specifical exception
2015-07-03 11:18:53 +08:00
Christoph M. Becker
21029da71c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added more tests to improve function coverage
2015-07-03 03:12:09 +02:00
Edgar R. Sandi
48d71af7ed
Added more tests to improve function coverage
2015-07-03 03:02:40 +02:00
Aaron Piotrowski
68baa539dc
Allow integer default for float type
2015-07-02 18:07:24 -05:00
Christoph M. Becker
2768bdbce0
updated NEWS
2015-07-03 00:29:44 +02:00
Christoph M. Becker
caa539b481
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #69975 : PHP segfaults when accessing nvarchar(max) defined columns
2015-07-03 00:25:03 +02:00
Christoph M. Becker
616661e0f8
updated NEWS
2015-07-03 00:23:44 +02:00
Christoph M. Becker
16db4d1462
Fix #69975 : PHP segfaults when accessing nvarchar(max) defined columns
...
The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.
The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.
2015-07-03 00:15:47 +02:00
Bob Weinand
57881e878d
Update NEWS for bug #69957
2015-07-02 21:19:26 +02:00
Niklas Keller
5f72d94a8b
Correct type hint name for booleans in method signatures
2015-07-02 21:14:30 +02:00
Bob Weinand
6ff72467dc
XFAILED tests are not "You may have found a problem in PHP"
2015-07-02 20:49:30 +02:00
Bob Weinand
94722e12cf
Introduce ArithmeticError
2015-07-02 20:47:44 +02:00
Dmitry Stogov
b874f1a73d
Cleanup (avoid reallocation)
2015-07-02 20:29:06 +03:00
Dmitry Stogov
07e646f8ff
Cleanup (avoid reallocation)
2015-07-02 19:09:37 +03:00
Dmitry Stogov
9ea98d676b
Cleanup (avoid reallocations)
2015-07-02 18:58:04 +03:00
Dmitry Stogov
0fd2b4c030
Cleanup (avoid reallocation)
2015-07-02 18:50:54 +03:00
Anatol Belski
d0787534c0
add missing items to the table of contents
2015-07-02 16:34:42 +02:00
Anatol Belski
79ca2b06b6
update UPGRADING infos
2015-07-02 16:32:57 +02:00
Anatol Belski
6f3dd4d45b
fix pipe peek timeout
2015-07-02 15:19:38 +02:00
Christoph M. Becker
58b982afed
Fix alignment on 32-bit
2015-07-02 14:23:07 +02:00
Christoph M. Becker
a88c68f833
improve timings evaluations in test
2015-07-02 14:23:06 +02:00
Anatol Belski
cefca35692
use proper place to cleanup
2015-07-02 14:23:05 +02:00
Anatol Belski
4fe8d629d0
fix test for systems with lower time resolution
2015-07-02 14:23:04 +02:00
Anatol Belski
8fed210610
remove stderr descriptor
2015-07-02 14:23:03 +02:00
Anatol Belski
afd8ebca78
no need to fflush here
2015-07-02 14:23:02 +02:00
Anatol Belski
5750058ddb
added test for bug #69900
2015-07-02 14:23:01 +02:00
Anatol Belski
aec332e6b4
select the case to set the pipe blocking option more precisely
2015-07-02 14:23:00 +02:00
Anatol Belski
d6130fada6
fixed wrong number for the new option
2015-07-02 14:22:59 +02:00
Anatol Belski
4e5758f377
fix c/p issue
2015-07-02 14:22:58 +02:00
Anatol Belski
d516a14fb9
properly set the pipe blocking option
2015-07-02 14:22:57 +02:00
Anatol Belski
1a5a4d546e
add missing stuff is the header
2015-07-02 14:22:56 +02:00
Anatol Belski
734d907aa4
initial stuff to make allow blocking pipes on windows
2015-07-02 14:22:55 +02:00
Xinchen Hui
6de750efb7
Fixed conditional jump or move depends on uninitialised value(s)
...
==11551== at 0x57CB23C: xpmParseData (parse.c:702)
2015-07-02 19:02:49 +08:00
Xinchen Hui
72b0627315
Fixed bug #69521 (Segfault in gc_collect_cycles()).
2015-07-02 18:43:06 +08:00
Xinchen Hui
3422fb57c8
Use hash_str directly
2015-07-02 12:31:26 +08:00
Xinchen Hui
ba91bc36cd
Same here
2015-07-02 12:23:50 +08:00
Xinchen Hui
ba711aec30
Use one_char_string
2015-07-02 12:19:55 +08:00
Xinchen Hui
0e68e27854
Use one_char_string
2015-07-02 12:18:23 +08:00
Xinchen Hui
70d7ecfec6
Use zend_string in setcookie (save value reallocated)
2015-07-02 12:04:28 +08:00
Xinchen Hui
017d3530f3
Unnecessary duplication
2015-07-02 11:47:22 +08:00
Xinchen Hui
fc58025627
This can not be true
2015-07-02 11:04:24 +08:00
Bob Weinand
06fcf94c45
CT eval ZEND_DIV in all cases (warning was removed)
2015-07-02 02:20:58 +02:00
Bob Weinand
007d7ac7ca
Use DivisionByZeroError instead of exception for %/intdiv()
2015-07-02 02:20:58 +02:00
Bob Weinand
f9724b93f6
Remove warning upon division by zero
2015-07-02 02:20:58 +02:00
Dmitry Stogov
fa1abb5677
Fixed memory leak because of incorrect 'if ();' optimization
2015-07-02 02:00:34 +03:00
Christoph M. Becker
e6f1638ad0
updated NEWS
2015-07-01 23:50:12 +02:00
Christoph M. Becker
e49922d3f8
Fix #69976 : Unable to parse "all" urls with colon char
...
If a colon occurs in a query string or fragment of a partial URL without
scheme, parse_url() tries to regard it as port separator. If up to 5 digits
follow and then a slash or the end of the string, parse_url() fails.
We're fixing this by checking whether the colon is part of the query string or
the fragment, under the assumption that question marks and hash signs are only
allowed as separators of query string and fragments, respectively, what is
guarenteed for URIs (RFC 3986), but not necessarily for URLs (RFC 1738) where
question marks are allowed for usernames and passwords.
Anyhow, this constitutes a minor BC, so the fix is applied to master only.
2015-07-01 23:48:16 +02:00
Dmitry Stogov
6daed13c8b
Cleanup (removed dead code)
2015-07-01 22:18:40 +03:00
Dmitry Stogov
b4db4114c5
Cleanup (avoid reallocation)
2015-07-01 22:17:55 +03:00
Dmitry Stogov
887e5ad110
Cleanup (avoid reallocation)
2015-07-01 22:17:08 +03:00
Dmitry Stogov
d2d326a381
Cleanup (avoid reallocatios and side effects in php_strip_tags)
2015-07-01 19:04:18 +03:00
Dmitry Stogov
068f63ceb2
Fixed broken name
2015-07-01 18:23:06 +03:00
Dmitry Stogov
2ea3258ed5
Cleanup (updated comments)
2015-07-01 17:32:04 +03:00
Dmitry Stogov
819fd30cb3
Cleanup (replce hack by a clean implementation)
2015-07-01 17:30:00 +03:00
Dmitry Stogov
26e8329d0d
Cleanup (removed dead code)
2015-07-01 17:07:57 +03:00
Dmitry Stogov
c34651e8f8
Cleanup (avoid duplication)
2015-07-01 17:01:42 +03:00
Dmitry Stogov
eeaf73439a
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
change the inclusion order which fixes the vc build
2015-07-01 16:32:13 +03:00
Dmitry Stogov
a0b55e6a37
Cleanup (updated comments about optimization of comparison with IS_NULL)
2015-07-01 16:31:20 +03:00
Anatol Belski
333db013fd
change the inclusion order which fixes the vc build
2015-07-01 15:21:34 +02:00
Dmitry Stogov
e2baf737ae
Cleanup (we don't use is_ref=1/refcount=2 trick to trigger COW in PHP-7)
2015-07-01 16:15:45 +03:00
Dmitry Stogov
c47c526290
Cleanup (avoid reallocation)
2015-07-01 14:59:58 +03:00
Dmitry Stogov
89b49b02fc
Cleanup (avoid reallocation)
2015-07-01 14:12:46 +03:00
Dmitry Stogov
7d82deab35
Cleanup (avoid reallocation).
2015-07-01 14:08:54 +03:00
Dmitry Stogov
34ec1c96e7
Cleanup (avoid reallocation).
2015-07-01 13:49:57 +03:00
Dmitry Stogov
f7b6de5b5e
Cleanup (avoid string reallocations)
2015-07-01 13:26:39 +03:00
Dmitry Stogov
53403fe56d
Get rid of ZVAL_ZVAL() macro usages. Replace them with more clear and optimal equialent sequences.
2015-07-01 02:05:21 +03:00
Rasmus Lerdorf
324d5ecb7e
debug_print_backtrace has a 2nd optional arg
2015-06-30 09:57:49 -07:00
Rasmus Lerdorf
f2249bf95a
php_uname has an optional arg
2015-06-30 09:55:00 -07:00
Xinchen Hui
ab0771c60a
Merge branch 'amortize-hash-compaction' of https://github.com/kaja47/php-src
2015-06-30 21:26:07 +08:00
Dmitry Stogov
7aa7627172
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 13:59:27 +03:00
Côme Bernigaud
d554d64f64
Merge branch 'PHP-5.6'
...
* PHP-5.6:
keep LDAP_DEPRECATED in config.w32
2015-06-30 09:31:19 +02:00
Anatol Belski
57525d01dc
keep LDAP_DEPRECATED in config.w32
2015-06-30 09:30:48 +02:00
Aaron Piotrowski
f7565a93d8
Add tests for dynamic static call to instance method
2015-06-30 07:07:17 +02:00
Aaron Piotrowski
ffd36e0fc8
Throw Error on dynamic call to instance method when called statically
2015-06-30 07:07:17 +02:00
Bob Weinand
dd2e6e866d
Fix test failures from previous commit
...
(I really don't get that issue in phar... if there's a better fix, it's welcome...)
2015-06-30 07:02:56 +02:00
Christopher Jones
99cac5055e
More PHP 7 patches (Rajendra/Abdullah)
2015-06-30 13:54:40 +10:00
Bob Weinand
6ad9cd5367
Only call stream_flush if anything was written
...
This avoids flushing in readonly mode upon close
2015-06-30 03:49:54 +02:00
Dmitry Stogov
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
Christopher Jones
8cce5b2641
Fix Windows compilation warnings (Senthil)
2015-06-30 08:48:37 +10:00
Christoph M. Becker
8b064a18c8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Improved code coverage of explode function
2015-06-29 23:55:18 +02:00
Edgar R. Sandi
1b1a86c415
Improved code coverage of explode function
2015-06-29 23:49:41 +02:00
Christoph M. Becker
e32a60dd88
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added basic and error tests for hex2bin function
2015-06-29 23:16:50 +02:00
Edgar R. Sandi
d2bc45f6b3
Added basic and error tests for hex2bin function
2015-06-29 23:10:50 +02:00
Anatol Belski
845b191f16
refix the negative zend_long to size_t casts
...
There is no good way to fix this for 32-bit without enormously
overcomplicating the logic. Therefore switching back to the previous
code and adding the casts to ensure there are no sudden casts of
negative to size_t.
2015-06-29 20:41:39 +02:00
Christoph M. Becker
a378322409
Merge branch 'PHP-5.6'
...
* PHP-5.6:
adding several other testing scenarios of code without coverage in stripcslashes function
2015-06-29 19:26:01 +02:00
Edgar R. Sandi
a8d61ab7f0
adding several other testing scenarios of code without coverage in stripcslashes function
2015-06-29 19:20:23 +02:00
Christoph M. Becker
df8f3a0eaa
Merge branch 'PHP-5.6'
...
* PHP-5.6:
adding another testing scenario without coverage in setlocale function
2015-06-29 18:25:30 +02:00
Edgar R. Sandi
7acdfdc84e
adding another testing scenario without coverage in setlocale function
2015-06-29 18:15:03 +02:00
Dmitry Stogov
6cf6f2c6bf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
On Windows PHP may be restarted with different set of DSO extensions without SHM reset. This may make optimisation for entities from DSO extensions inconsistent.
Putting back deprecated symbols for ldap_sort
Removed deprecated function calls from ldap module
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-29 18:14:14 +03:00
Dmitry Stogov
dc588997e2
On Windows PHP may be restarted with different set of DSO extensions without SHM reset.
...
This may make optimisation for entities from DSO extensions inconsistent.
2015-06-29 18:01:01 +03:00
Dmitry Stogov
ee1e67fae6
On Windows PHP may be restarted with different set of DSO extensions without SHM reset.
...
This may make optimisation for entities from DSO extensions inconsistent.
2015-06-29 17:45:56 +03:00
jrchamp
edb3ab2a2a
UPGRADING typos/wording
2015-06-29 16:16:51 +02:00
Dmitry Stogov
4bd22cf1c1
Improved zend_string API (Francois Laupretre)
...
Squashed commit of the following:
commit d96eab8d79b75ac83d49d49ae4665f948d15a804
Author: Francois Laupretre <francois@tekwire.net >
Date: Fri Jun 26 01:23:31 2015 +0200
Use the new 'ZSTR' macros in the rest of the code.
Does not change anything to the generated code (thanks to compat macros) but cleaner.
commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8
Author: Francois Laupretre <francois@tekwire.net >
Date: Thu Jun 25 13:45:06 2015 +0200
Improve zend_string API
Add missing methods
2015-06-29 16:44:54 +03:00
Côme Bernigaud
667e9bd417
Deprecating ldap_sort the right way
2015-06-29 14:31:20 +02:00
Dmitry Stogov
66031cfe19
Restored old behavior
2015-06-29 14:10:46 +03:00
Anatol Belski
c783645b99
fix more places with subtle negative zend_long to size_t cast
2015-06-29 12:15:21 +02:00
Anatol Belski
c2ac0304a9
remove useless check
...
thanks Yasuo :)
2015-06-29 12:15:20 +02:00
Anatol Belski
8ccf29eb04
remove comment
...
f and l are the $start and $length, since they come from the user
land, they only can be zend_long
2015-06-29 12:15:19 +02:00
Dmitry Stogov
0b35e4a3be
Revert "Fixed last previously broken tests"
...
This reverts commit 79b1832dd5 .
2015-06-29 13:05:14 +03:00
Dmitry Stogov
642c379092
Prevent attempts of compile-time evaluation of invalid operators (e.g. division/modulo by zero and shift by negative number)
2015-06-29 12:58:07 +03:00
Dmitry Stogov
1bba4452e7
Reverted wrong fb08798c9f
2015-06-29 12:20:09 +03:00
Andreas Heigl
6e84f8e95e
Fixes ldap_sort-tests
...
Thanks to Côme Bernigaud for fixing!
2015-06-29 11:11:11 +02:00
Andreas Heigl
85aabd3e85
Adds deprecation-message for ldap_sort
2015-06-29 11:11:11 +02:00
Dmitry Stogov
625dba022c
Don't evaluate invalid constant expressions.
2015-06-29 11:35:12 +03:00
Anatol Belski
5060060317
fix negative zend_long to size_t cast
2015-06-29 10:27:42 +02:00
Edgar R. Sandi
8271890d8d
removed unreachable code in the substr_replace function
2015-06-29 10:27:41 +02:00
Dmitry Stogov
8e923197b4
Fixed bug #69955 (Segfault when trying to combine [] and assign-op on ArrayAccess object). (Laruence)
2015-06-29 11:17:56 +03:00
Anatol Belski
07c971b665
keep LDAP_DEPRECATED in config.w32
2015-06-29 10:12:36 +02:00
Côme Bernigaud
d4077410b8
Putting back deprecated symbols for ldap_sort
2015-06-29 09:42:47 +02:00
Côme Bernigaud
0483b6e868
Removed deprecated function calls from ldap module
...
ldap_search -> ldap search_ext
ldap_search_s ->_ldap_search_ext_s
ldap_add_s -> ldap_add_ext_s
ldap_delete_s -> ldap_delete_ext_s
ldap_compare_s -> ldap_compare_ext_s
ldap_value_free -> ldap_memvfree
Only thing left is ldap_sort_entries, no replacement
Conflicts:
ext/ldap/ldap.c
2015-06-29 09:42:47 +02:00
Côme Bernigaud
4f7808ec50
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
...
Conflicts:
ext/ldap/ldap.c
2015-06-29 09:42:47 +02:00
Xinchen Hui
bb3d545e5e
Merge branch 'master' of git.php.net:php-src
2015-06-29 15:36:55 +08:00
Xinchen Hui
4cc0096e00
Fixed memroy errors with valgrind
2015-06-29 15:36:02 +08:00
Stanislav Malyshev
265b73e6ff
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
Conflicts:
ext/standard/mail.c
2015-06-29 00:31:56 -07:00
Côme Bernigaud
2e85e6d3ee
Merge PR about LDAP cleaning by removing deprecated calls
...
Merge branch 'pull-request/1357' into PHP-5.6
* pull-request/1357:
Putting back deprecated symbols for ldap_sort
Removed deprecated function calls from ldap module
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-29 09:31:37 +02:00
Stanislav Malyshev
d7daf814b7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-29 00:30:55 -07:00
Xinchen Hui
a5d38e0dea
Merge branch 'master' of git.php.net:php-src
2015-06-29 15:17:58 +08:00
Xinchen Hui
5ba28d76d2
Fixed segfault in wordpress (introduced in rev 4a4529adb0)
2015-06-29 15:13:09 +08:00
Côme Bernigaud
736d840c8b
Putting back deprecated symbols for ldap_sort
2015-06-29 09:07:49 +02:00
Anatol Belski
5e3a3461c2
fix tests
2015-06-29 09:05:56 +02:00
Anatol Belski
a1cf46bb1f
remove useless assignment
2015-06-29 07:33:20 +02:00
Anatol Belski
8430ec1788
fix FCGI crash in TS mode
...
If CGI TS build is used, and there are some hard errors (fe missing
dependency .dll or .so), the core will want to log it. The CGI
log function will want to check whether fcgi_logging is enabled. But,
if this kind of error happens in the extension register phase,
MINIT for the CGI module is most likely wasn't run yet (startup phase).
That will result in accessing uninitialized globals and a crash.
2015-06-29 07:33:19 +02:00
Stanislav Malyshev
8f2e08239f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-28 20:23:00 -07:00
Stanislav Malyshev
cd9c39d77c
Merge branch 'pull-request/1350' into PHP-5.4
...
* pull-request/1350:
Move strlen() check to php_mail_detect_multiple_crlf()
Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-28 20:18:56 -07:00
Bob Weinand
b34f9bc2e9
Fix assertion failure with Z_REFCOUNT() in info constants
2015-06-29 03:43:51 +02:00
Rasmus Lerdorf
01ceb0f7fa
2nd arg of sprintf is optional
2015-06-28 18:08:22 -07:00
Bob Weinand
088f589f7d
Make backtraces *much* more readable
2015-06-29 02:51:10 +02:00
Bob Weinand
f500471e8c
Add yield from to frame leaving instructions
2015-06-29 02:05:33 +02:00
Bob Weinand
5e16722309
Show exception source in phpdbg
2015-06-29 01:41:04 +02:00
Bob Weinand
79b1832dd5
Fixed last previously broken tests
2015-06-29 01:00:12 +02:00
Bob Weinand
e5fae77969
Show full signature upon inheritance mismatch
2015-06-29 01:00:12 +02:00
Bob Weinand
9f77c44d47
Remove now unneeded step option (-s)
2015-06-29 01:00:12 +02:00
Jakub Zelenka
f30503ce4e
Fix incompatible JSON errors
...
This fixes differences in error codes with PHP 5 and 7.
The malformed UTF-8 and control character error codes are
now returned even in non-string context which makes it
the same as it was in PHP 5 json ext.
2015-06-28 18:09:10 +01:00
Bob Weinand
fb08798c9f
Fix bug #69957 (Different ways of handling div/mod by zero)
2015-06-28 18:22:59 +02:00
Jakub Zelenka
64c371142c
Fix bug #62010 (json_decode produces invalid byte-sequences)
2015-06-28 17:16:12 +01:00
Jakub Zelenka
695b4f4cad
Bump re2c version for json scanner
2015-06-28 16:48:42 +01:00
Bob Weinand
b477aa1fad
Fix bug #69952 (Dereferencing issue in session_start())
2015-06-28 16:30:58 +02:00
Bob Weinand
e96ad43ae6
Forgot to git add rope leak test
2015-06-28 15:44:53 +02:00
Bob Weinand
4a4529adb0
Fix rope memory leaks upon exception
2015-06-28 15:42:15 +02:00
Xinchen Hui
f70950d004
Fixed ZEND_VM_DEFINE_OP build when --without-specializer
2015-06-28 21:16:08 +08:00
Xinchen Hui
15979d2c9e
Merge branch 'master' of git.php.net:php-src
2015-06-28 19:17:37 +08:00
Xinchen Hui
a486294e7d
Unused ret
2015-06-28 19:16:00 +08:00
Anatol Belski
7d0fb66032
updated NEWS
2015-06-28 13:13:41 +02:00
Cameron Porter
621698d3f9
Correct oci8 hash destructors to prevent segfaults, and a few other fixes.
2015-06-28 13:05:25 +02:00
Anatol Belski
b81188518b
tweak the zendparse symbol to be exported with newer bison
2015-06-28 00:10:41 +02:00
Anatol Belski
2eea8c1adb
fix touching
2015-06-27 23:38:48 +02:00
Anatol Belski
84c4945599
touch all the files before creating a tarball
2015-06-27 22:06:15 +02:00
Anatol Belski
8858d02f63
fix one more bad char in the NEWS
2015-06-27 21:09:00 +02:00
Anatol Belski
ea2ad6f6e4
remove BOM and a unicode char from the NEWS
2015-06-27 21:08:00 +02:00
Christoph M. Becker
b06996b561
updated NEWS
2015-06-27 20:07:06 +02:00
Christoph M. Becker
a7bbc68bac
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed #69655 : php -S changes MKCALENDAR request method to MKCOL
2015-06-27 20:05:30 +02:00
Christoph M. Becker
7e97faa3e8
updated NEWS
2015-06-27 20:03:38 +02:00
Christoph M. Becker
bbe28d3a55
Fixed #69655 : php -S changes MKCALENDAR request method to MKCOL
...
The parsing of the request method in the CLI server has been faulty, so that
several unsupported methods have been recognized as other methods.
2015-06-27 20:02:21 +02:00
Christoph M. Becker
1ec6ff0b49
Merge branch 'PHP-5.6'
...
* PHP-5.6:
added skip condition for powershell requirement of test
2015-06-27 15:05:29 +02:00
Christoph M. Becker
b811bb3920
added skip condition for powershell requirement of test
2015-06-27 15:02:52 +02:00
Christoph M. Becker
486d59dcfe
updated NEWS
2015-06-27 14:38:37 +02:00
Christoph M. Becker
4e32ecb90a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #64878 : 304 responses return Content-Type header
2015-06-27 14:35:20 +02:00
Christoph M. Becker
0730fc8830
updated NEWS
2015-06-27 14:32:34 +02:00
Christoph M. Becker
1920ba6f7b
Fix #64878 : 304 responses return Content-Type header
...
According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.
2015-06-27 14:28:33 +02:00
Christopher Jones
692d283707
Merge some fixes from Senthil. Some test diffs still remain.
2015-06-27 10:01:55 +10:00
Christopher Jones
7a9764c5bb
Fix table name in initialization DROP TABLE statement
2015-06-27 10:01:15 +10:00
Tjerk Meesters
3bf012a98d
Feature: Enhanced array_column() to also work with object elements.
2015-06-27 07:35:44 +08:00
Christoph M. Becker
86df85f43a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
added regression test for bug #69679
2015-06-27 01:10:41 +02:00
Christoph M. Becker
6400ef192c
added regression test for bug #69679
...
DOMDocument::loadHTML refuses to accept NULL bytes.
2015-06-27 01:08:56 +02:00
Christoph M. Becker
95459a4d16
Merge branch 'PHP-5.6'
...
* PHP-5.6:
slightly revised bug69462.phpt
Test for bug #69462
2015-06-26 23:27:25 +02:00
Christoph M. Becker
bdf3bb668f
slightly revised bug69462.phpt
2015-06-26 23:20:22 +02:00
Tomasz Sawicki
af17316fcd
Test for bug #69462
...
Test scenario for already fixed bug #69462 with segmentation fault when
SoapVar XML node name was null.
2015-06-26 23:19:29 +02:00
Bob Weinand
25e1b49ea1
Fix warning in zend_execute.c by explicit cast
2015-06-26 20:39:56 +02:00
Bob Weinand
2894bc5bb8
Use ZEND_INIT_STATIC_METHOD_CALL for literals of form "classname::method"
2015-06-26 19:55:13 +02:00
Aaron Piotrowski
1d704a05ee
Fix closure leak test
2015-06-26 16:30:01 +02:00
Aaron Piotrowski
8bd95b8cdc
Fix test duplication, add more tests
2015-06-26 16:30:01 +02:00
Christoph M. Becker
36e2d26adb
restricted test to English locale (fails otherwise)
2015-06-26 16:27:45 +02:00
Christoph M. Becker
3bd6bb6f50
fixed broken test (syntax error in SKIPIF section)
2015-06-26 15:57:28 +02:00
Kalle Sommer Nielsen
4b737793bc
Add test for bug #69939
2015-06-26 15:35:16 +02:00
Kalle Sommer Nielsen
85bbfb191d
Fixed bug #69939 (Casting object to bool returns false)
2015-06-26 15:30:03 +02:00
Kalle Sommer Nielsen
3b589d8ca5
Merge branch 'master' of https://git.php.net/push/php-src
2015-06-26 10:24:45 +02:00
Bob Weinand
1335ebd068
Fix Closure leak in aborted INIT_DYNAMIC_FCALL
2015-06-26 05:10:58 +02:00
Aaron Piotrowski
bc0df38e88
Added more indirect call tests, remove invalid test
2015-06-25 19:46:28 -05:00
Aaron Piotrowski
ba67fc2218
Fix 'Class::method' indirect call with empty method name
2015-06-25 19:37:52 -05:00
Edgar R. Sandi
098a4cc3eb
moved function warning test to money_format_error.phpt file
2015-06-25 20:34:41 -03:00
Tjerk Meesters
03a670eaaa
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed #69882 : OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
2015-06-26 06:03:29 +08:00
Tjerk Meesters
2ff3dafccf
Fixed #69882 : OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
...
Squashed commit of the following:
commit a64c1d9bc4c129fd946a478bdcb55101e42157b7
Author: Tomasz Sawicki <falundir@gmail.com >
Date: Wed Jun 24 08:49:37 2015 +0200
Fix #69882 : OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
The "key values mismatch" error is triggered in openssl_pkcs12_read by
PKCS12_parse, because it uses X509_check_private_key to separate main
certificate (which corresponds to private key) from extra certificates.
Extra certificates usually comes first (p12 contents are reversed as
stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
error.
The fix pops "key values mismatch" error from OpenSSL error stack for
each extra certificate if there are any.
2015-06-26 05:33:28 +08:00
Rasmus Lerdorf
7ceb47477d
3rd arg to stream_set_timeout is optional
...
ignore_user_abort() should take a bool not a string
2015-06-25 10:31:37 -07:00
Julien Pauli
20585beb76
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix unknown size of void error
2015-06-25 19:13:49 +02:00
Julien Pauli
b1ec4515b0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix unknown size of void error
2015-06-25 19:13:20 +02:00
Anatol Belski
80f9a9725c
fix unknown size of void error
2015-06-25 19:12:26 +02:00
Kalle Sommer Nielsen
7517d385ea
Merge branch 'master' of https://git.php.net/push/php-src
2015-06-25 19:09:00 +02:00
Dmitry Stogov
2a2f42c25d
Optimize out usless conditions used by specializer
2015-06-25 18:56:14 +03:00
Anatol Belski
04b26ba5c6
update the doc in regard to the latest discussions
2015-06-25 16:39:02 +02:00
Anatol Belski
0955f9513f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
backport missing rev bfdc9e2805
2015-06-25 11:35:11 +02:00
Anatol Belski
7bb52dda6a
backport missing rev bfdc9e2805
2015-06-25 11:34:04 +02:00
Dmitry Stogov
f5fd58f737
Better check for __builtin_constant_p() availability
2015-06-25 12:02:28 +03:00
Dmitry Stogov
90976c9978
Moved test to correct place
2015-06-25 11:22:21 +03:00
Bob Weinand
f42cdf83b0
Fix paths issue when fetching .phpdbginit under Windows
2015-06-25 00:36:01 +02:00
Ferenc Kovacs
190478e9da
Merge remote-tracking branch 'origin/PHP-5.6'
...
* origin/PHP-5.6:
5.6.12 next
2015-06-25 00:23:21 +02:00
Ferenc Kovacs
1efe5b1157
5.6.12 next
2015-06-25 00:21:45 +02:00
Hannes Magnusson
4a6503a524
Typo (thanks kaplan@)
2015-06-24 08:24:11 -07:00
Xinchen Hui
2a9e012aa5
Merge branch 'master' of git.php.net:php-src
2015-06-24 21:44:31 +08:00
Xinchen Hui
fa61f921f9
Micro optimization
2015-06-24 21:42:54 +08:00
Bob Weinand
ab90e55b9e
Passing a zend_string * to %s is a bad idea
2015-06-24 15:29:26 +02:00
Julien Pauli
2424b349ad
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.5.28 now - Security Only
2015-06-24 10:45:42 +02:00
Julien Pauli
ca82114f21
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.28 now - Security Only
Conflicts:
configure.in
main/php_version.h
2015-06-24 10:42:41 +02:00
Julien Pauli
8e440dc1d7
5.5.28 now - Security Only
2015-06-24 10:41:06 +02:00
Anatol Belski
e821a13a4d
fix NEWS
2015-06-24 10:21:54 +02:00
Rasmus Lerdorf
1201be392f
3rd arg to define() is optional
2015-06-23 23:53:23 -04:00
Rasmus Lerdorf
56b0d6f3a0
Wrong arginfo on assert
...
(not adding types, just fixing a missing arg)
2015-06-23 22:41:41 -04:00
Hannes Magnusson
517196b065
PHP7 sounds like a good time to include signatures in announce mails
...
We need these posted as many places as possible to make any sense.
2015-06-23 19:33:37 -07:00
Hannes Magnusson
ce01d7361e
space
2015-06-23 19:29:10 -07:00
Christoph M. Becker
d90763d4c6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Made bug44295-win.phpt locale independent
2015-06-24 02:04:34 +02:00
Christoph M. Becker
c201b63873
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Made bug44295-win.phpt locale independent
2015-06-24 01:42:22 +02:00
Christoph M. Becker
cd068b1ed6
Made bug44295-win.phpt locale independent
...
Formerly it failed on non English installations.
2015-06-24 01:41:33 +02:00
Christoph M. Becker
27e557a169
Merge branch 'master' of https://git.php.net/repository/php-src
...
# By Rasmus Lerdorf (3) and others
# Via Rasmus Lerdorf
* 'master' of https://git.php.net/repository/php-src :
Fix more proto comments
prepare NEWS for next
Fix more minor mistakes in the proto comments
Avoid op_num = -1 in unfinished generator cleanup
Fix incorrect protos
2015-06-24 01:15:44 +02:00
Christoph M. Becker
7464424776
updated NEWS
2015-06-24 00:54:20 +02:00
Christoph M. Becker
00adcbd3e9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
2015-06-24 00:47:18 +02:00
Christoph M. Becker
e181931f77
updated NEWS
2015-06-24 00:42:24 +02:00
Christoph M. Becker
905c5f4858
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
2015-06-24 00:32:13 +02:00
Christoph M. Becker
b03f743e7d
updated NEWS
2015-06-24 00:31:07 +02:00
Christoph M. Becker
8da8dc04b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
2015-06-24 00:23:39 +02:00
Christoph M. Becker
921544cad9
updated NEWS
2015-06-24 00:20:32 +02:00
Christoph M. Becker
a621781fdb
Fixed bug #69768 (escapeshell*() doesn't cater to !)
...
When delayed variable substitution is enabled (can be set in the
Registry, for instance), !ENV! works similar to %ENV%, and so ! should
be escaped like %.
2015-06-24 00:15:55 +02:00
Rasmus Lerdorf
28d7bb97a1
Fix more proto comments
2015-06-23 17:46:20 -04:00
Anatol Belski
2d2bd2db97
prepare NEWS for next
2015-06-23 22:26:11 +02:00
Rasmus Lerdorf
41774bceff
Fix more minor mistakes in the proto comments
2015-06-23 15:47:33 -04:00
Nikita Popov
ea5c66ec93
Avoid op_num = -1 in unfinished generator cleanup
...
Also add two tests showing that the -1 substraction in the
computation of op_num is really necessary.
2015-06-23 20:17:30 +02:00
Rasmus Lerdorf
f4d08d8e5c
Fix incorrect protos
2015-06-23 14:15:24 -04:00
Christoph M. Becker
e08d27d650
updated NEWS
2015-06-23 19:44:22 +02:00
Christoph M. Becker
ca049e0ae9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
2015-06-23 19:41:02 +02:00
Christoph M. Becker
13347225ac
updated NEWS
2015-06-23 19:36:59 +02:00
Christoph M. Becker
e1561c490e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
2015-06-23 19:32:57 +02:00
Christoph M. Becker
1cbcbcbc21
updated NEWS
2015-06-23 19:32:18 +02:00
Christoph M. Becker
23e25f3319
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
...
When advancing after empty matches, php_pcre_match_impl() as well as
php_pcre_replace_impl() always have to advance to the next code point when the
u modifier is given, instead of to the next byte.
2015-06-23 19:28:09 +02:00
Côme Bernigaud
5250fc772d
Removed deprecated function calls from ldap module
...
ldap_search -> ldap search_ext
ldap_search_s ->_ldap_search_ext_s
ldap_add_s -> ldap_add_ext_s
ldap_delete_s -> ldap_delete_ext_s
ldap_compare_s -> ldap_compare_ext_s
ldap_value_free -> ldap_memvfree
Only thing left is ldap_sort_entries, no replacement
2015-06-23 16:44:48 +02:00
Côme Bernigaud
ea49be9b37
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-23 15:50:14 +02:00
Kalle Sommer Nielsen
6129a56c02
Merge branch 'master' of https://git.php.net/push/php-src
2015-06-23 13:39:12 +02:00
Kalle Sommer Nielsen
77eb51bffd
Merge branch 'master' of https://git.php.net/push/php-src
2015-06-23 11:19:31 +02:00
George Wang
fdb580a5ad
bump API version to 6.8
2015-06-22 23:38:38 -04:00
Kalle Sommer Nielsen
41404bfafd
Also silence copy here
2015-06-22 15:26:21 +02:00
Dominic
9c07ae6341
Cleaned white spaces in PHP_INI definition of phar
...
Removes unnecessary white spaces.
2015-06-19 12:31:03 +02:00
Yasuo Ohgaki
d263ecd864
Move strlen() check to php_mail_detect_multiple_crlf()
2015-06-19 15:17:56 +09:00
Yasuo Ohgaki
dacea3f6fb
Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-19 12:19:12 +09:00
Gunter Grodotzki
5f80da29ee
fix typo, see #68476
2015-06-04 18:27:08 +02:00
Reeze Xia
4e2afbc1a0
Fixed phpdbg build broken when dtrace enabled
...
This also fixed a zend_string related warning
2015-04-07 23:04:34 +08:00
K
b3962ab940
zend_hash_do_resize: amortizing the cost of compaction
...
New implementation of hashtables introduced a compaction step which is
triggered when a hashtable is full but it contains at least one deleted
bucket. Therefore there is a possibility that a cleverly crafted code can
trigger this compaction step (which takes time proportional to the size of
hashtabe) by executing constatnt number of operations. When the hashtable
is full, deletion and subsequent addition or single element triggers a
table compaction and these two steps can be repeated ad infinitum. This
might be avenue for a DOS attack.
This patch allows compaction to be performed only if the hashtable contains
at least 1/32 deleted elements, otherwise the hashtable is doubled in size.
Linear amount of work caused by compaction is amortized over multiple
malicious additions and deletions.
2015-03-26 19:05:38 +01:00