Anatol Belski
904c5d7ba8
kick unused var
2013-07-15 17:23:16 +02:00
Stanislav Malyshev
68e630b72f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:35 -07:00
sasezaki
e617679c0b
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
2013-07-15 00:36:29 -07:00
kazusuke sasezaki
76775a3aa7
fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:19 -07:00
Veres Lajos
2c73ce4363
revert false fix
2013-07-15 00:23:17 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
b79b13b4ef
less serious compatAbility fixes
2013-07-15 00:21:39 -07:00
Veres Lajos
bb64106f64
typos (orig)
2013-07-15 00:20:49 -07:00
Veres Lajos
f23a5fbc8e
revert false fix
2013-07-15 00:19:07 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Veres Lajos
b8a2b254a1
typos (orig)
2013-07-15 00:18:32 -07:00
Veres Lajos
227556c6a2
less serious compatAbility fixes
2013-07-15 00:17:35 -07:00
Stanislav Malyshev
9cc9d32e6a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add built-in web server to invocation list
Terminology: change embedded web server to built-in web server to align with cli usage
Align -B and -E parameter names with cli usage (begin_code and end_code)
Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
2013-07-14 17:01:43 -07:00
Anatol Belski
6e3134610c
Merge branch 'PHP-5.4' of https://github.com/php/php-src into PHP-5.4
2013-07-14 20:48:26 +02:00
Anatol Belski
168a5bb6df
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix uninitialized memory usage
2013-07-14 20:46:19 +02:00
Anatol Belski
add0833681
fix uninitialized memory usage
2013-07-14 20:44:29 +02:00
Stanley Sufficool
d012bdca03
Fix Bug #65219
...
DBSETLDBNAME should be called before login to set DBNAME in login record
2013-07-14 11:16:42 -07:00
Felipe Pena
efc89368dd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
2013-07-13 17:54:41 -03:00
Felipe Pena
0863a0d6a0
- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
2013-07-13 17:54:31 -03:00
Felipe Pena
4bd2f755ba
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
Fixed meta data retrieve when OID is larger than 2^31
2013-07-12 20:23:31 -03:00
Felipe Pena
281936b295
- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
2013-07-12 20:23:00 -03:00
Yasuo Ohgaki
0ddb3d97de
Fixed meta data retrieve when OID is larger than 2^31
2013-07-13 06:06:23 +09:00
Yasuo Ohgaki
bccc3e2ec0
Fixed meta data retrieve when OID is larger than 2^31
2013-07-13 06:05:18 +09:00
Yasuo Ohgaki
002f3ff4dc
Inprove pg_unescape_bytea() error message
2013-07-13 06:05:17 +09:00
Anatol Belski
ecf057d197
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:49:41 +02:00
Anatol Belski
2acc386270
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:48:12 +02:00
Christopher Jones
3478ddc1f0
Cleanup temp test file
2013-07-10 11:17:52 -07:00
Johannes Schlüter
26019d2022
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-10 19:38:00 +02:00
Johannes Schlüter
4204e2cb5b
Merge branch 'PHP-5.3' into PHP-5.4
2013-07-10 19:36:12 +02:00
Johannes Schlüter
710eee5555
add test for bug #65236
2013-07-10 19:35:18 +02:00
Christopher Jones
cd7e56e536
Cleanup temp file
2013-07-09 14:51:47 -07:00
Derick Rethans
06cef326fd
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-09 09:07:17 +01:00
Derick Rethans
c7ee677f2f
- Updated to version 2013.4 (2013d)
2013-07-09 09:07:16 +01:00
Christopher Jones
6ac7c9d0a7
Bump PECL package info version check to allow PECL installs with PHP 5.5+
2013-07-08 13:32:04 -07:00
Andrey Hristov
2c3f6dcdb6
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
...
Conflicts:
NEWS
2013-07-08 20:28:51 +02:00
Andrey Hristov
dd71f1f173
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-07-08 20:27:14 +02:00
Andrey Hristov
3dd5f4ae4c
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 20:23:32 +02:00
Yasuo Ohgaki
bde0f1318a
Added warning for hex2bin() when input is invalid string
2013-07-08 19:14:45 +09:00
Yasuo Ohgaki
2bc8271b29
Add warning to pg_unescape_bytea() when invalid parameter is passed
2013-07-08 18:51:37 +09:00
Ben Ramsey
d1c261d7f8
array_column: Changing integer in test output to use %d
2013-07-06 20:50:34 +00:00
Rob Richards
eed492ce84
Merge branch 'PHP-5.4' into PHP-5.5
...
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.4:
truncate results at depth of 255 to prevent corruption
fix assembly of safe_address() for x86 and x86_64
fix assembly of safe_address() for x86 and x86_64
2013-07-06 08:00:58 -04:00
Rob Richards
e4a28b7b7b
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Rob Richards (1)
* PHP-5.3:
truncate results at depth of 255 to prevent corruption
2013-07-06 07:59:20 -04:00
Rob Richards
7d163e8a08
truncate results at depth of 255 to prevent corruption
2013-07-06 07:53:07 -04:00
Anatol Belski
332e46b3aa
Extended the test for bug #65184
2013-07-03 22:52:51 +02:00
Felipe Pena
00293fec05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed build on FreeTDS 0.82
2013-07-03 15:02:39 -03:00
Felipe Pena
7549beb102
- Fixed build on FreeTDS 0.82
2013-07-03 15:02:03 -03:00
Johannes Schlüter
9aa7343ae0
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-03 17:10:58 +02:00
Johannes Schlüter
5bc7e597d9
Make sure return value is initialised in case transaction startup fails
2013-07-03 17:08:14 +02:00
Johannes Schlüter
631bb27dca
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/acinclude.m4
2013-07-03 16:58:20 +02:00
