Xinchen Hui
9714ceb92b
Merge branch 'PHP-5.4'
2012-10-18 20:14:54 +08:00
Xinchen Hui
f1478bbf9d
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 20:13:36 +08:00
Xinchen Hui
db2dc7a6a4
indent
2012-10-18 20:13:14 +08:00
Xinchen Hui
84efca62ff
Merge branch 'PHP-5.4'
2012-10-18 20:12:00 +08:00
Xinchen Hui
1f8fd609b0
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 20:11:32 +08:00
Xinchen Hui
e88cdaa014
better fix for #63055
2012-10-18 20:10:35 +08:00
Xinchen Hui
4eece4c86a
Merge branch 'PHP-5.4'
2012-10-18 17:35:29 +08:00
Xinchen Hui
54cef2bb6d
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 17:33:52 +08:00
Xinchen Hui
8bd5e15ff7
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
2012-10-18 17:31:27 +08:00
Johannes Schlüter
82fb5df380
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-17 18:26:27 +02:00
Andrey Hristov
7314ed535f
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
2012-10-17 17:23:37 +02:00
Andrey Hristov
c50d732f76
fix compilation failure on 32/64bit linux systems, when libmysql is used
...
with ext/mysql
2012-10-17 17:22:31 +02:00
Andrey Hristov
d62702851c
fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems
2012-10-17 16:35:36 +02:00
Andrey Hristov
54cbf5315c
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-16 15:06:22 +02:00
Andrey Hristov
b0e8fb6489
fix newly introduced segfault
2012-10-16 15:06:02 +02:00
ULF WENDEL
1fafc9b373
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:56:30 +02:00
ULF WENDEL
7aa3d0ae65
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:55:51 +02:00
Anatoliy Belsky
6d019deee2
Fixed bug #63248 Load multiple magic files on win
...
- adapt config.w32 to not to use dirent lib anymore
- prevent libmagic from opening a dir handle under win
- reimplement the dir iteration functionality with streams
2012-10-16 11:03:32 +02:00
ULF WENDEL
da541ff561
Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:54:54 +02:00
ULF WENDEL
917639d463
Updating expected output in anticipation of mysqlnd_auth.c path
2012-09-29 17:42:00 +02:00
Anatoliy Belsky
3c89f8507f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63248 Load multiple magic files on win
Conflicts:
NEWS
2012-10-16 11:14:11 +02:00
Anthony Ferrara
9aacdf6e89
Merging in Password Hashing API into master
...
This implements the accepted RFC password_hash https://wiki.php.net/rfc/password_hash
2012-10-16 04:11:37 -04:00
Anthony Ferrara
0bc9ca39ce
Refactor to using a stack based zval instead of dynamic allocation
2012-10-07 05:42:08 -04:00
Anthony Ferrara
37b2207f66
Clean up unreported memory leak by switching to zval_ptr_dtor
2012-10-07 05:12:02 -04:00
Anthony Ferrara
76e83f769f
fix allocation and copy issue
2012-10-06 12:33:48 -04:00
Anthony Ferrara
1751d5fabe
Really fix leaks, add test cases to prove it...
2012-10-06 10:38:41 -04:00
Anthony Ferrara
25b2d364e9
Fix issue with possible memory leak
2012-10-05 15:53:40 -04:00
Anthony Ferrara
4a7d18c79e
Fix some double free issues, and more cleanup work
2012-10-05 15:31:58 -04:00
ULF WENDEL
ccf749e38d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- BFN
Minor changes for MySQL 5.6
NEWS for 76601c4
2012-09-29 12:21:55 +02:00
ULF WENDEL
13d4d8e2d0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Minor changes for MySQL 5.6
NEWS for 76601c4
Conflicts:
NEWS
2012-09-29 12:17:13 +02:00
Felipe Pena
9a6bc88565
- Fixed bug #63214 (Large PDO Firebird Queries)
2012-10-12 19:42:43 -03:00
Gustavo Lopes
f8e26d95f2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #63240 on stream_get_line()
2012-10-12 20:24:13 +02:00
Gustavo Lopes
76601c4fd1
Fix bug #63240 on stream_get_line()
...
stream_get_line() could contain the delimiter string if that string
had more than one character. The bug manifested itself when a read on
the stream ended with part of the delimiter string and the read after
would start with the rest of the delimiter string; provided that
the data of first read did not complete the max length result of the
call to stream_get_line() with the partial delimiter used in that max
length return. In that case, the delimiter will still appear in
the result, divided in two subsequent return values. That is not a bug.
See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html >
2012-10-12 20:23:43 +02:00
Anatoliy Belsky
5020b51d72
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
2012-10-12 19:50:35 +02:00
Anatoliy Belsky
a36a5315b8
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed tests for gd having freetype >= 2.4.10
2012-10-12 19:38:13 +02:00
Anatoliy Belsky
131d7d7a89
fixed tests for gd having freetype >= 2.4.10
2012-10-12 19:34:31 +02:00
Xinchen Hui
0c0b5a3543
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
...
The exists test should has covered this bug
2012-10-12 10:37:05 +08:00
Anatoliy Belsky
674ccefc2d
Fix warnings preventing this test from passing
2012-10-10 11:01:07 +02:00
Xinchen Hui
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
45e938ec34
Remove executable permission on phpt
2012-10-10 10:31:53 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +08:00
Xinchen Hui
931571260b
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:15:18 +08:00
Xinchen Hui
45e0d452c5
Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
2012-10-09 13:13:51 +08:00
Anatoliy Belsky
9a99426e80
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
exposing the libxpm version in phpinfo
2012-10-04 18:21:07 +02:00
Anatoliy Belsky
5d9fb8ffeb
exposing the libxpm version in phpinfo
2012-10-04 18:20:02 +02:00
Derick Rethans
b004a04f0a
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2012-10-04 08:39:34 +01:00