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
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
4ac0d96faa
Deduplicate usort code
2015-07-18 21:53:03 +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
Nikita Popov
42e32c33e2
More warning fixes
2015-07-17 21:12:15 +02:00
Nikita Popov
208257eec5
Explicitly ignore mblen(NULL, 0) retval
2015-07-16 22:39:11 +02:00
Anatol Belski
0dce8373cd
forked test for windows
2015-07-16 15:05:04 +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
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
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
0cd9c4eb2b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adding tests for getprotobyname and getprotobynumber functions
2015-07-11 00:20:46 +02:00
Edgar R. Sandi
49c0c1299a
Adding tests for getprotobyname and getprotobynumber functions
2015-07-11 00:16:42 +02:00
Edgar R. Sandi
28c3b55fa8
adding scenario of test to improve test coverage
2015-07-09 16:43:31 -03: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
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
Xinchen Hui
94957a7091
Fixed invalid read
2015-07-08 19:19:37 +08:00
Julien Pauli
4c34d57414
Fix test related to c22da81
2015-07-07 16:01:44 +02: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
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
Xinchen Hui
550bbf8f46
Fixed bug #69983 (get_browser fails with user agent of null)
2015-07-04 11:05:50 +08:00
Aaron Piotrowski
ed1b64877d
Switch position of ce in exception ce variable names
2015-07-03 09:45:03 -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
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
Bob Weinand
94722e12cf
Introduce ArithmeticError
2015-07-02 20:47:44 +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
d516a14fb9
properly set the pipe blocking option
2015-07-02 14:22:57 +02:00
Anatol Belski
734d907aa4
initial stuff to make allow blocking pipes on windows
2015-07-02 14:22:55 +02:00
Xinchen Hui
72b0627315
Fixed bug #69521 (Segfault in gc_collect_cycles()).
2015-07-02 18:43:06 +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
007d7ac7ca
Use DivisionByZeroError instead of exception for %/intdiv()
2015-07-02 02:20:58 +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
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
c47c526290
Cleanup (avoid reallocation)
2015-07-01 14:59:58 +03:00
Rasmus Lerdorf
f2249bf95a
php_uname has an optional arg
2015-06-30 09:55:00 -07: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