Julien Pauli
9266227402
5.5.18 now
2014-09-03 10:18:51 +02:00
Matteo Beccati
d1b0066df7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed test with freetype >= 2.4.12
2014-09-03 09:45:17 +02:00
Matteo Beccati
627704b38e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test with freetype >= 2.4.12
2014-09-03 09:45:09 +02:00
Matteo Beccati
72c9b0e12b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test with freetype >= 2.4.12
2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027
Fixed test with freetype >= 2.4.12
2014-09-03 09:43:29 +02:00
Dmitry Stogov
b0f0211b1a
Revert "Fixed memory leaks"
...
This reverts commit 0940e54ffc
.
2014-09-03 02:38:04 +04:00
Dmitry Stogov
0940e54ffc
Fixed memory leaks
2014-09-03 02:07:38 +04:00
Stanislav Malyshev
6036d47e6a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.4.34 is next
2014-09-02 15:04:08 -07:00
Stanislav Malyshev
3e7d11b632
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.34 is next
2014-09-02 15:04:00 -07:00
Stanislav Malyshev
a734acd439
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.34 is next
Conflicts:
configure.in
main/php_version.h
2014-09-02 15:03:54 -07:00
Stanislav Malyshev
5e95b61639
5.4.34 is next
2014-09-02 15:03:04 -07:00
Stanislav Malyshev
91505203c0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:19:16 -07:00
Stanislav Malyshev
0c6e2b5219
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:19:03 -07:00
Stanislav Malyshev
70f92aa97e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:18:05 -07:00
Stanislav Malyshev
fe551c089a
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
...
This reverts commit 53fa6c5b6b
.
The change breaks tests, so not putting it into 5.4.
2014-09-02 14:15:39 -07:00
Stanislav Malyshev
ce776aea57
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:33:02 -07:00
Stanislav Malyshev
63f42adbb2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:32:40 -07:00
Stanislav Malyshev
af85eff5b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:32:03 -07:00
Stanislav Malyshev
53fa6c5b6b
Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:31:03 -07:00
Dmitry Stogov
f0ad7472b0
Avoid memory allocation/deallocation in BEGIN_SILENCE/END_SILENCE opcode handlers.
2014-09-02 22:13:24 +04:00
Nikita Popov
2d364747ca
Merge branch 'PHP-5.6'
...
Conflicts:
ext/gmp/gmp.c
2014-09-02 19:07:54 +02:00
Nikita Popov
834daa455b
Fixed bug #50175
...
0x and 0b prefix is now only handled if either no base is given
or if the base is 16 (0x) or 2 (0b). Always handling it is incorrect
because 0x and 0b are perfectly valid numbers in other bases.
2014-09-02 19:04:55 +02:00
Nikita Popov
7533243f0c
Fix C89 build and small cleanup
2014-09-02 18:52:13 +02:00
Nikita Popov
5138f3ba22
Skip 64bit test on 32bit
...
Also minor type improvements
2014-09-02 18:42:39 +02:00
Anatol Belski
08b732f26b
fix datatypes for gmp to be compatible with GMP/MPIR on different platforms
2014-09-02 18:19:51 +02:00
Anatol Belski
e7386aa1fd
add a test with gmp and PHP_INT_MAX
2014-09-02 18:16:19 +02:00
Anatol Belski
20e15f55e8
one semicolon too much
2014-09-02 16:40:41 +02:00
Anatol Belski
d7700588a9
use portable strtol
2014-09-02 15:56:15 +02:00
Anatol Belski
fee39d0868
fix type
2014-09-02 15:56:13 +02:00
Nikita Popov
e3da88b898
mpz functions don't work on zend_ulongs...
...
If we really want to support zend_ulong > ulong in GMP the right
approach would be to only handle < LONG_MAX in ui shortcut functions
and use mpz_import in convert_to_gmp for number > LONG_MAX.
2014-09-02 14:37:15 +02:00
Nikita Popov
8e7cd7a0f9
Merge branch 'PHP-5.6'
...
Conflicts:
ext/gmp/gmp.c
2014-09-02 14:28:07 +02:00
Leigh
47d630e7f0
Implement gmp_import() and gmp_export()
2014-09-02 14:19:18 +02:00
Dmitry Stogov
e321170c18
Fixed memory leaks
2014-09-02 14:11:22 +04:00
Dmitry Stogov
e51677b2e6
fixed reference counting
2014-09-02 11:24:52 +04:00
Dmitry Stogov
1670772dc6
Avoid string duplication
2014-09-02 09:52:23 +04:00
Dmitry Stogov
f789568707
Fixed destruction on error
2014-09-02 09:46:27 +04:00
Tjerk Meesters
aa759743b3
Revert "Updated UPGRADING"
...
This reverts commit 300c0cf1c4
.
2014-09-02 07:58:51 +08:00
Tjerk Meesters
300c0cf1c4
Updated UPGRADING
2014-09-02 06:55:18 +08:00
Tjerk Meesters
0785143351
Updated NEWS
2014-09-02 06:55:17 +08:00
Tjerk Meesters
297a9b1f75
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Make DOMNode::textContent writeable
Updated UPGRADING
Updated NEWS
Conflicts:
ext/dom/attr.c
ext/dom/characterdata.c
ext/dom/document.c
ext/dom/node.c
2014-09-02 06:54:52 +08:00
Stanislav Malyshev
d5b0606a62
Reintroduce fix from pull #770 in a PHP 7 way
2014-09-01 15:41:27 -07:00
Stanislav Malyshev
a7666a6041
Fix ZTS build
2014-09-01 15:41:00 -07:00
Tjerk Meesters
f54451cf39
Make DOMNode::textContent writeable
2014-09-02 06:34:18 +08:00
Tjerk Meesters
8da58e36b4
Updated UPGRADING
2014-09-02 06:32:56 +08:00
Tjerk Meesters
83bacd2fe0
Updated NEWS
2014-09-02 06:32:56 +08:00
Stanislav Malyshev
d18803eb5f
fix apache handler build
2014-09-01 14:49:52 -07:00
Stanislav Malyshev
1ff1a0dde2
Revert "Merge branch 'PHP-5.6'"
...
This reverts commit aaf5689f4d
, reversing
changes made to 481bf25b6a
.
2014-09-01 14:35:04 -07:00
Stanislav Malyshev
aaf5689f4d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
Fix typo from commit 32314f6b6
Fix destruction order in zend_shutdown (bug #65463 , #66036 )
Conflicts:
Zend/zend_compile.h
Zend/zend_execute_API.c
2014-09-01 12:22:41 -07:00
Stanislav Malyshev
57f82819e9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
Fix typo from commit 32314f6b6
Fix destruction order in zend_shutdown (bug #65463 , #66036 )
2014-09-01 12:20:34 -07:00
Stanislav Malyshev
4b9fcc01d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
Fix typo from commit 32314f6b6
Fix destruction order in zend_shutdown (bug #65463 , #66036 )
2014-09-01 12:15:54 -07:00