c3a303d431
Merge branch 'pull-request/1473'
...
* pull-request/1473:
new test for enchant pwl file
2015-08-17 21:42:42 +02:00
3b004baaaa
new test for enchant pwl file
2015-08-17 21:28:37 +02:00
c4a98e876c
Check and use correct signature_len type for EVP_VerifyFinal
2015-08-17 18:43:02 +01:00
b28758f253
updated NEWS
2015-08-17 19:35:10 +02:00
07c1b641b5
fixed changed error message in test
2015-08-17 19:33:49 +02:00
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
3ed58fb5d7
updated NEWS
2015-08-17 17:27:13 +02:00
aae9004ebd
Removed dead code
2015-08-17 17:18:25 +02:00
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
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
ce89fd9758
Fixed bug #70262 (Accessing array crashes PHP 7.0beta3)
2015-08-17 12:58:14 +03:00
2d475eb943
Fixed tests on 32-bit systems
2015-08-17 12:54:33 +03:00
9a895396c9
Merge branch 'PHP-5.6'
2015-08-16 21:27:50 +01:00
b010a9d846
Fixed sorting order
...
It needs to match the strcasecmp in parse_tz.c.
2015-08-16 21:27:07 +01:00
cdaf057adb
Updated to version 2015.6 (2015f)
2015-08-16 21:26:12 +01:00
8811847b24
Empty merge
2015-08-16 21:26:12 +01:00
7cafffc31f
Updated to version 2015.6 (2015f)
2015-08-16 21:26:11 +01:00
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
1613359543
update NEWS
2015-08-15 17:29:58 +02:00
46101dbec5
fix incompatible types
...
namely between hash_data_type and st_data_t
2015-08-15 12:03:47 +02:00
3689b44453
add SIZEOF_SIZE_T to oniguruma
2015-08-15 11:39:06 +02:00
228eaf5bc4
fix pointer truncation cases
2015-08-15 11:27:07 +02:00
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
b0c5439b5f
Updated NEWS for #70157
2015-08-15 15:13:01 +08:00
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
0d7159d26d
Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 15:10:34 +08:00
c63b505573
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed wrong params in proto
2015-08-15 02:27:09 +02:00
a4e0539188
fixed wrong params in proto
2015-08-15 02:23:56 +02:00
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
e13de24101
updated NEWS
2015-08-14 17:19:29 +02:00
fc444896af
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70264 : CLI server directory traversal
2015-08-14 17:18:35 +02:00
6366679906
Executed file can be NULL
...
So revert this part to what it was originally.
2015-08-14 17:16:45 +02:00
23d0b93893
updated NEWS
2015-08-14 17:11:33 +02:00
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
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
13567d5dee
Don't copy zend_strings during exception creation
...
Minor optimization...
2015-08-14 16:16:27 +02:00
38c19d43c1
fix array size calculation for range, related to bug #70239
2015-08-14 14:34:48 +02:00
86984d7ade
add range() tests
2015-08-14 14:34:48 +02:00
01ee09f3f7
Fixed bug #70239 Creating a huge array doesn't result in exhausted, but segfault
2015-08-14 14:34:47 +02:00
ad27aded5c
updated NEWS
2015-08-14 14:32:56 +02:00
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
0e51f9798c
updated NEWS
2015-08-14 14:20:37 +02:00
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
a094f4faed
Remove useless insert
2015-08-14 17:09:27 +08:00
97433d8f6e
Fixed dumpbt
2015-08-14 16:20:53 +08:00
57a8620761
Set expectations
2015-08-14 10:59:39 +03:00
d6db83816c
We don't need CVS/SVN keywords in UPGRADING.
2015-08-13 12:40:46 -07:00
edafed6b68
We did eventually decide it was PHP 7.0, so make it so.
2015-08-13 12:39:41 -07:00
f9744a36a2
Merge branch 'pull-request/1454'
...
* pull-request/1454:
Docs for find_tested.php
2015-08-13 20:33:59 +02:00
66866fb838
Simplify the macro (HT_DATA_SIZE/HT_HASH_SIZE is not used outside Zend)
2015-08-13 23:38:39 +08:00
Christoph M. Becker