Yasuo Ohgaki
4dd3fbfcd2
Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
2014-11-06 13:06:29 +09:00
Anatol Belski
d4050f42fd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2014-11-05 15:43:13 +01:00
Anatol Belski
53266476e6
fix dir separator in test
2014-11-05 15:42:45 +01:00
Bob Weinand
342d56b23d
arg1-3 are not variable names to use; removed useless buffer variable
2014-11-04 16:59:32 +01:00
Stanislav Malyshev
c511e0560f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
2014-11-03 11:43:51 -08:00
Stanislav Malyshev
acd93dfb6d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
2014-11-03 11:43:40 -08:00
Stanislav Malyshev
0ddcf2a919
update NEWS
2014-11-03 11:43:15 -08:00
Remi Collet
7740edae36
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
...
Drop use of php memory allocators as this raise various conflicts
with other extensions and libraries which use libgmp.
No other solution found.
We cannot for ensure correct use of allocator with shared lib.
Some memory can allocated before php init
Some memory can be freed after php shutdown
Known broken run cases
- php + curl + gnutls + gmp
- mod_gnutls + mod_php + gnutls + gmp
- php + freetds + gnutls + gmp
- php + odbc + freetds + gnutls + gmp
- php + php-mapi (zarafa) + gnutls + gmp
2014-11-03 11:42:15 -08:00
Stanislav Malyshev
90ba99a2c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
2014-11-03 11:38:29 -08:00
Stanislav Malyshev
279550ee85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283 : fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044 : Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
Conflicts:
configure.in
ext/curl/interface.c
main/php_version.h
2014-11-03 11:37:43 -08:00
Stanislav Malyshev
c351b47ce8
Initialize the offset table - PCRE may sometimes miss offsets
2014-11-03 11:31:02 -08:00
George Wang
bba11e3255
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-11-03 11:44:13 -05:00
George Wang
3918e544d8
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-11-03 11:43:43 -05:00
George Wang
4435161456
set default response code to 200
2014-11-03 11:43:04 -05:00
George Wang
19f3f4b155
set default response code to 200
2014-11-03 11:42:45 -05:00
George Wang
1a2ec3fc60
set default response code to 200
2014-11-03 11:42:01 -05:00
Matteo Beccati
e12d69df0c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66584 Segmentation fault on statement deallocation
2014-11-01 19:20:43 +01:00
Matteo Beccati
69f6aee35c
Fixed bug #66584 Segmentation fault on statement deallocation
2014-11-01 19:19:56 +01:00
Xinchen Hui
00b50850eb
Add credit
2014-11-01 22:29:55 +08:00
Anatol Belski
1b1f7c627a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix ZTS build
2014-10-31 19:53:39 +01:00
Anatol Belski
1fc80d0ca7
fix ZTS build
2014-10-31 19:53:16 +01:00
Matteo Beccati
e797db8909
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
2014-10-31 18:57:59 +01:00
Matteo Beccati
29ee694341
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
2014-10-31 18:54:16 +01:00
Matteo Beccati
9580fcfedd
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
2014-10-31 18:11:32 +01:00
Xinchen Hui
d017c4bf3a
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
2014-10-31 17:36:33 +08:00
Xinchen Hui
d9d181e5ad
Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)
2014-10-31 17:32:23 +08:00
Bob Weinand
113f1fd6d5
Temporarily disable wait/xml protocol...
2014-10-30 23:09:57 +01:00
Ferenc Kovacs
067852ca61
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
don't try to send in the test results until we restored qa.php.net
Don't treat warnings as failures in the junit output
Conflicts:
.travis.yml
2014-10-30 18:14:37 +01:00
Ferenc Kovacs
5515937073
don't try to send in the test results until we restored qa.php.net
2014-10-30 18:12:37 +01:00
Bob Weinand
b9d1dc329f
Merge phpdbg into PHP-5.6
2014-10-30 13:17:58 +01:00
Bob Weinand
4fd66387a9
Fix uninitialized value...
2014-10-30 12:15:27 +01:00
Anatol Belski
73e2dd3381
add DLL export to the output globals
2014-10-30 10:27:20 +01:00
Xinchen Hui
9e1da42af1
Use macro
2014-10-30 11:52:29 +08:00
Xinchen Hui
7b4993dd16
Fixed build.... (shouldn't it be zend_output_globals?)
2014-10-30 11:42:02 +08:00
Anatol Belski
fc904569ea
fix output globals importing
2014-10-29 20:03:28 +01:00
Anatol Belski
5d76185792
export output globals
...
needed by phpdbg
2014-10-29 20:02:41 +01:00
Anatol Belski
4b8f411d31
use portable strndup implementation
2014-10-29 19:49:20 +01:00
Anatol Belski
f842b8f4be
unix sockets aren't available on windows
2014-10-29 19:39:46 +01:00
Anatol Belski
fdbfcc0b51
dll export APIs needed by phpdbg
2014-10-29 19:32:52 +01:00
Anatol Belski
79a4339f1b
fix sapi/phpdbg/config.w32
2014-10-29 19:28:21 +01:00
Matteo Beccati
8bd58502ca
Don't treat warnings as failures in the junit output
...
This matches Travis and the actual return code.
2014-10-29 14:34:58 +01:00
Matteo Beccati
a3b4f8320d
Don't treat warnings as failures in the junit output
...
This matches Travis and the actual return code.
2014-10-29 14:33:36 +01:00
Bob Weinand
68b5dd2ba9
Merge phpdbg into PHP-5.6
2014-10-29 11:43:01 +01:00
Bob Weinand
6545a5c234
Merge php-src into phpdbg
2014-10-29 11:40:56 +01:00
Matteo Beccati
eb4e4b7bca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test to work with recent libcurl versions
PHP 5.5.20 now
Conflicts:
configure.in
main/php_version.h
2014-10-29 11:32:12 +01:00
Matteo Beccati
daf9357d27
Fixed test to work with recent libcurl versions
2014-10-29 11:28:27 +01:00
Bob Weinand
919bd3eb0c
Enable shared builds for webhelper
2014-10-29 11:28:09 +01:00
Remi Collet
89e613cf01
cleanup uneeded json
2014-10-29 07:26:41 +01:00
Remi Collet
7dd871438f
cleanup uneeded json
2014-10-29 07:26:41 +01:00
Bob Weinand
beb767dbe0
Merge phpdbg into PHP-5.6
2014-10-28 23:06:50 +01:00
