Stanislav Malyshev
a328803803
Revert "Fixed bug #64604 "
...
This reverts commit b05c088a3a
.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
2014-04-24 23:50:45 -07:00
Stanislav Malyshev
8b903f24d5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix a compiler warning in php_rand.h
2014-04-20 16:35:49 -07:00
Rouven Weßling
68283c9f4a
Fix a compiler warning in php_rand.h
2014-04-20 16:35:36 -07:00
Stanislav Malyshev
5addf223d5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:25:03 -07:00
Boro Sitnikovski
a18cec1b86
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:22:44 -07:00
Anatol Belski
7c400dc867
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improved the fix for bug #67072 , thanks Nikita
2014-04-18 15:14:42 +02:00
Anatol Belski
c2acdbdd3d
Improved the fix for bug #67072 , thanks Nikita
2014-04-18 15:13:32 +02:00
Anatol Belski
dc407c2402
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67072 Echoing unserialized "SplFileObject" crash
Conflicts:
ext/standard/var_unserializer.c
2014-04-17 11:05:21 +02:00
Anatol Belski
5328d42899
Fixed bug #67072 Echoing unserialized "SplFileObject" crash
...
The actual issue lays in the unserializer code which doesn't honor
the unserialize callback. By contrast, the serialize callback is
respected. This leads to the situation that even if a class has
disabled the serialization explicitly, user could still construct
a vulnerable string which would result bad things when trying
to unserialize.
This conserns also the classes implementing Serializable as well
as some core classes disabling serialize/unserialize callbacks
explicitly (PDO, SimpleXML, SplFileInfo and co). As of now, the
flow is first to call the unserialize callback (if available),
then call __wakeup. If the unserialize callback returns with no
success, no object is instantiated. This makes the scheme used
by internal classes effective, to disable unserialize just assign
zend_class_unserialize_deny as callback.
2014-04-17 10:48:14 +02:00
Stanislav Malyshev
30ec1c0051
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64604
2014-04-13 18:38:36 -07:00
Ingo Walz
b05c088a3a
Fixed bug #64604
2014-04-13 18:37:40 -07:00
Stanislav Malyshev
df8e34bcc1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix windows build
2014-04-13 17:03:28 -07:00
Stanislav Malyshev
3a2660b302
Fix windows build
2014-04-13 17:02:21 -07:00
Stanislav Malyshev
fe72caa6e5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:23:32 -07:00
Gabor Buella
1010200da5
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:17:04 -07:00
Bob Weinand
bf3edbada6
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-13 23:03:53 +02:00
Bob Weinand
beda5093b4
Reverted to 5a0da281e5
...
Discussion: http://news.php.net/php.cvs/76836
2014-04-13 23:01:31 +02:00
Bob Weinand
191d9fc227
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-13 19:37:06 +02:00
Bob Weinand
f07e37c96d
Forgot title in phpt for bug #67064
2014-04-13 19:34:17 +02:00
Bob Weinand
eca0644e0a
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-13 19:25:07 +02:00
Bob Weinand
1a4a9eede5
Fix bug #67064 in a BC safe way
...
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().
2014-04-13 19:24:12 +02:00
Ferenc Kovacs
e00e4b9334
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
abstract namespace for unix sockets is a linux only feature
2014-04-09 19:02:25 +02:00
Ferenc Kovacs
2c8aeda6dc
abstract namespace for unix sockets is a linux only feature
2014-04-09 19:01:01 +02:00
Tjerk Meesters
287790d5c8
Don't test for specific non-zero substr_compare() return value
2014-04-09 20:10:34 +08:00
Tjerk Meesters
032921d80c
Fixed bug 67043
2014-04-09 07:33:55 +08:00
Michael Wallner
ba4fddd2da
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66182 exit in stream filter produces segfault
2014-04-03 09:08:35 +02:00
Michael Wallner
7ab5c593f7
Fix bug #66182 exit in stream filter produces segfault
...
Unfortunately, a segv caused by exit cannot be tested reliably.
2014-04-03 09:07:35 +02:00
Michael Wallner
f453917f62
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:37:50 +02:00
Michael Wallner
1ec83d44a1
Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:36:39 +02:00
Michael Wallner
af147ac9b7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64330
2014-04-02 11:10:59 +02:00
Michael Wallner
91a9d24aa3
Fix bug #64330
...
stream_socket_server() creates wrong Abstract Namespace UNIX sockets
2014-04-02 11:09:26 +02:00
Mateusz Kocielski
156cc39e21
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed off-by-one in php_url_parse_ex
2014-03-18 08:57:30 +01:00
Mateusz Kocielski
497b918e62
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed off-by-one in php_url_parse_ex
Conflicts:
ext/standard/url.c
2014-03-18 08:54:57 +01:00
Mateusz Kocielski
46566b78c9
Fixed off-by-one in php_url_parse_ex
...
Change order of condition, previously pointer could be derefrenced before
bound check was done.
2014-03-18 08:48:41 +01:00
Nikita Popov
ecf7570072
Merge branch 'PHP-5.4' into PHP-5.5
2014-03-06 23:12:41 +01:00
Dmitry Panin
e2fc6b52f0
Fix HTML entity table generation
2014-03-06 23:10:31 +01:00
Tjerk Meesters
bbd0781b39
Merge branch 'PHP-5.4' into PHP-5.5
2014-03-03 05:56:22 +08:00
Tjerk Meesters
e73c05b75e
proc_open(): separate environment values that aren't strings
...
Added a test case
2014-03-03 05:49:52 +08:00
datibbaw
2e459be237
substr_compare(): Allow zero length comparison
...
Treat zero length comparison as always equal.
2014-02-28 23:45:04 +08:00
Tjerk Meesters
d022c8565d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test case title
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
2014-02-28 22:30:21 +08:00
Tjerk Meesters
eca13f7909
Fixed test case title
2014-02-28 22:27:32 +08:00
Tjerk Meesters
79b3c2a744
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
...
A newline is added to the mail headers when mail.add_x_header is used and no other headers are passed to mail().
The scenario in which custom headers are used was already fixed in #48620 , back in 2009.
2014-02-28 22:22:07 +08:00
Lior Kaplan
c09bd9def0
Merge branch 'PHP-5.4' into PHP-5.5
2014-02-14 15:30:00 +02:00
Veres Lajos
35101e9ef4
a few typofixes
2014-02-14 14:51:10 +02:00
Dmitry Panin
179e45920c
Make html_table_gen consistent with html_table.h
...
In commit 6dabd7de04
the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.
2014-01-30 02:04:38 -08:00
Stanislav Malyshev
d5560faaa3
drop precision since trigonometric functions are non-portable
...
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
2014-01-26 15:51:17 -08:00
Stanislav Malyshev
1dcaa109a1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
drop precision since trigonometric functions are non-portable
2014-01-26 15:15:38 -08:00
Stanislav Malyshev
35cb180d9e
drop precision since trigonometric functions are non-portable
...
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
2014-01-26 15:14:16 -08:00
Will Fitch
767e6d2e08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66509 : copy() arginfo incorrect since 5.4
Conflicts:
NEWS
2014-01-18 11:39:32 -05:00
Will Fitch
5b906ce6eb
Fix bug #66509 : copy() arginfo incorrect since 5.4
...
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
2014-01-18 11:25:53 -05:00
Johannes Schlüter
98e06a10d3
fix encoding
2014-01-10 15:57:40 +01:00
Anatol Belski
748e707bf9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
one more extension for the basename test
2014-01-05 19:21:27 +01:00
Anatol Belski
1c586d4070
one more extension for the basename test
2014-01-05 19:19:54 +01:00
Anatol Belski
3bde9cfd8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
improved the fix for bug #66395
2014-01-05 19:12:52 +01:00
Anatol Belski
3f7f72adb2
improved the fix for bug #66395
...
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
2014-01-05 19:05:04 +01:00
Anatol Belski
d3a053d9f4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:32:39 +01:00
Anatol Belski
46f60fae22
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:25:58 +01:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Eric Stenson
330168a247
Fix tests expecting specific resource IDs
...
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself. As a
result, these tests become false positives.
On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently. This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines. Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-15 16:51:21 +08:00
Sara Golemon
32a4cc8353
Use 'user@example.com' rather than 'user@company.com' in tests
...
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
2013-12-04 07:49:16 -08:00
Dmitry Stogov
2f5ab04c5f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests
2013-12-02 12:04:07 +04:00
Dmitry Stogov
edbefd1d5c
Fixed tests
2013-12-02 11:53:35 +04:00
Anatol Belski
ad5a63e8bc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2013-11-21 21:29:02 +01:00
Anatol Belski
345032946c
fixed test
2013-11-21 21:24:47 +01:00
Yasuo Ohgaki
b8b92bd790
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:23:54 +09:00
Yasuo Ohgaki
0d558afc05
Fix WS in serialization_error_002.phpt
2013-11-20 07:17:53 +09:00
Aaron Hamid
050dd59c63
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:14:53 +09:00
Jeff Welch
72a8489a12
Fixed tests that fail with non-default serialize_precision
configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:34 +09:00
Jeff Welch
101c780500
Fixed tests that fail with non-default serialize_precision
configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:23 +09:00
Xinchen Hui
de79c51555
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-17 17:05:04 +08:00
Xinchen Hui
823e330c75
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
2013-11-17 17:04:37 +08:00
Remi Collet
018b9445da
Fix failed test with recent glibc
...
In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See ddc7e412ab
So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string
Removing %Z from tested format gives the same behavior with all version.
2013-11-13 13:19:10 +01:00
Xinchen Hui
5f17c4d08e
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-08 15:33:27 +08:00
Xinchen Hui
cf2626f10c
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
...
previous codes: "#define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)):
(int)mbrlen(ptr, len, &BG(mblen_state)))#
it use mbsinit there, seems try to initialize the mblen_state, but:
"This function does not change the state identified by ps. Typical ways
to make the state pointed by ps an initial state are:
memset (ps,0,sizeof(*ps)); // ps points to zero-valued object
"
http://www.cplusplus.com/reference/cwchar/mbsinit/?kw=mbsinit
2013-11-08 15:32:28 +08:00
Ferenc Kovacs
91108818e1
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
2013-11-06 10:46:34 +01:00
Sara Golemon
8b6b39fdcf
Add a couple more test cases to parse_url() tests
...
http://::# (valid but silly)
http://# (invalid)
2013-11-06 10:32:11 +01:00
ptarjan
290becb1f1
fix missing change from 'tcp_socket' to the more common 'server'
2013-11-06 10:32:00 +01:00
ptarjan
9c1e1bbc05
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-11-06 10:31:47 +01:00
Yasuo Ohgaki
d04bcb8969
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:28:35 +09:00
Yasuo Ohgaki
4dc4302a30
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:24:23 +09:00
Dmitry Stogov
5c0890ba8a
Improved performance of array_merge() by eliminating useless copying
2013-10-28 13:31:44 +04:00
Antony Dovgal
b636c03426
fix bug #65936 (dangling context pointer causes crash)
...
reported by Leon Sorokin
2013-10-21 15:09:29 +04:00
Michael Wallner
fb610b4e80
remove TRAVIS check in test source
2013-10-21 12:18:58 +02:00
Michael Wallner
825174e480
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Just SKIP that test on travis
2013-10-21 12:18:10 +02:00
Michael Wallner
2ecf94e07e
Just SKIP that test on travis
2013-10-21 12:16:41 +02:00
Tjerk Meesters
51b809e3ad
Assume the free space is correct on Travis CI.
2013-10-17 12:12:05 +02:00
Michael Wallner
d72a4d1634
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
2013-10-04 16:17:37 +02:00
Michael Wallner
8973390541
fix bug #64146 (serialize incorrectly saving objects when they are
...
cloned)
2013-10-04 16:16:15 +02:00
Michael Wallner
adfb5ab7ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
such a weird hack probably helps in finding regressions in the future
2013-10-04 16:12:23 +02:00
Michael Wallner
e8ae795529
such a weird hack probably helps in finding regressions in the future
2013-10-04 16:11:49 +02:00
Michael Wallner
ad139d9a00
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61548
2013-10-01 11:08:20 +02:00
Michael Wallner
18b04b480e
Fixed bug #61548
2013-10-01 11:07:55 +02:00
Michael Wallner
9eaffd34c1
fix broken sha2 configure tests
...
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
2013-09-13 12:56:26 +02:00
Joey Smith
2139d2702d
Expose fputcsv's escape_char to userland
...
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
2013-08-24 20:45:14 -07:00
Stanislav Malyshev
bdccf0a61d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
Update NEWS
2013-08-24 19:49:27 -07:00
Michael M Slusarz
3f9af558e7
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:45:54 -07:00
Michael Wallner
6181948592
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:11 +02:00
Michael Wallner
d8023d13eb
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:17:22 +02:00
Anthony Ferrara
83e3466898
Fix return types of password API helper functions.
...
This fixes issues that were found during static analysis by cjones where failure was impossible to detect due to return type mangling (casting an int to a char, then comparing to an int).
2013-08-21 12:10:40 -04:00