Nikita Popov
f485c84a14
Don't always separate splice replacement array
...
Only perform separation when a typecast is done. Avoids doing a
full hash copy in many cases.
2014-04-09 12:31:21 +02:00
Nikita Popov
22d3eb3117
Add zend_hash_splice
...
This implements the original functionality of php_splice, but
as an in-place operation, thus avoiding copying the HT.
This is much faster (~10x) if the splice removes a small portion
of the array and doesn't insert many elements.
2014-04-09 12:31:21 +02:00
Nikita Popov
1aa8719e32
Add zend_hash_reindex
...
The implementation differs from the original in array.c in that it
rehashes the hashtable in the same loop. This is approximately two
times faster (not counting the rare case of a purely associative
array).
2014-04-09 12:31:21 +02:00
Tjerk Meesters
2aba2494f5
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-09 07:34:49 +08:00
Tjerk Meesters
032921d80c
Fixed bug 67043
2014-04-09 07:33:55 +08:00
Michael Wallner
5d42ce838c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #66182 exit in stream filter produces segfault
2014-04-03 09:09:24 +02: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
68c57f8149
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:38: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
669459da8c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #64330
2014-04-02 11:11:23 +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
Yasuo Ohgaki
a84e5dc37d
Remove unneeded string copy.
...
Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes.
More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.
2014-03-27 17:20:57 +09:00
Yasuo Ohgaki
e1fe76f28a
Add default_charset handling
2014-03-20 10:50:32 +09:00
Anatol Belski
ec11530620
remove obsolete comment
2014-03-19 06:35:58 +01:00
Anatol Belski
62f6c5853f
Fixes to various stream cast on win64
...
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.
2014-03-19 06:33:46 +01:00
Mateusz Kocielski
888f467d63
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed off-by-one in php_url_parse_ex
2014-03-18 09:53:58 +01: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
200c97829d
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-06 23:15:30 +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
330ffe2e24
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-03 05:58:03 +08: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
Tjerk Meesters
e424049840
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
substr_compare(): Allow zero length comparison
2014-02-28 23:48:34 +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
43ac0ab673
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test case title
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
2014-02-28 22:31:16 +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
Daniel Lowrey
3a9829af20
Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
2014-02-20 17:10:06 -07:00
Nikita Popov
7d5f806e77
Remove XFAIL from a test
...
Everything looks to be working fine, the test is just wrong.
INF equals INF as per IEEE 754.
2014-02-16 00:07:55 +01:00
Rouven Weßling
417dbfbacc
Declare a number of functions as variadic.
2014-02-16 00:07:55 +01:00
Lior Kaplan
23d952ed60
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-14 17:15:35 +02: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
Yasuo Ohgaki
cbd108abf1
Implement RFC https://wiki.php.net/rfc/default_encoding
2014-02-13 11:54:52 +09:00
Derick Rethans
75f59e148c
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-11 11:31:06 +00:00
Bob Weinand
363ff60475
Fixed memory leak in pow operator
2014-02-06 21:31:40 +01:00
datibbaw
aff56f3c45
add T_POW (**) operator
...
Fixed recognition of the operator
Added opcode, still doing multiply instead of pow()
opcode now always returns int(42)
The right answer, but always a float
Yanked code from pow() implementation.
Should not handle negative long as exponent ourselves
Added test cases from pow()
Moved precedence higher than '~'
Added GMP operator overloading
Added ZEND_ASSIGN_POW (**=) operator.
Added pow() as a language construct.
Adjusted test cases for changed precedence.
Reduced pow() to shell function around ZEND_API pow_function()
Reduced test case to only contain edge cases
Added overloading test case
Moved unary minus above T_POW
Revert "Added pow() as a language construct."
Bad bad bad idea.
This reverts commit f60b98cf7a8371233d800a6faa286ddba4432d02.
Reverted unary minus behaviour due to previous revert.
Convert arrays to int(0)
Exponent with array as a base becomes int(0)
Rebase against master
Fixed tokenizer test case
2014-02-06 14:41:21 +01: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
2fac5e5669
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
drop precision since trigonometric functions are non-portable
2014-01-26 15:15:50 -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
a540c57331
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66509 : copy() arginfo incorrect since 5.4
2014-01-18 11:56:22 -05:00