1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Commit Graph

91873 Commits

Author SHA1 Message Date
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
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
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