archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
110059 commits 526 branches 1434 tags 877 MiB
Commit graph

864 commits

Author SHA1 Message Date
Xinchen Hui
06739a1b72 dos2unix & skip on connect fail 2012-12-17 14:29:13 +08:00
Rasmus Lerdorf
5aabf243bf Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 16:54:44 -08:00
Rasmus Lerdorf
77c4b84ac8 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:54:31 -08:00
Rasmus Lerdorf
7a49e09fd8 Need connect.inc here 2012-12-13 16:54:16 -08:00
Rasmus Lerdorf
3925683d46 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 16:42:50 -08:00
Rasmus Lerdorf
d845549257 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:42:33 -08:00
Rasmus Lerdorf
9d1bc1b622 Fix broken test 
Need to use the configured connection parameters here. We can't assume
the test user has access.
 2012-12-13 16:41:56 -08:00
Xinchen Hui
093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Xinchen Hui
b689819567 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:29:59 +08:00
Xinchen Hui
40fabf68ed Fixed bug #63398 (Segfault when polling closed link) 2012-11-30 14:28:32 +08:00
Andrey Hristov
967a1ebe51 add protection against core dumps if the underlying library returns 
0x0 for some reason
 2012-10-18 15:09:17 +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
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
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
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
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
ULF WENDEL
20e76f4487 Minor changes for MySQL 5.6 2012-09-29 12:10:24 +02:00
ULF WENDEL
4969c7d50a Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  sapi/litespeed/lsapi_main.c: Fix bug #63228
  fix test
  constify
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
 2012-09-29 09:56:55 +02:00
Andrey Hristov
6fbcf69375 fix test 2012-10-12 10:35:45 +02:00
Xinchen Hui
4e5e8c9da0 Merge branch 'PHP-5.4' 2012-10-10 10:45:34 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
ULF WENDEL
a2098ca9eb SHA256 authentication tests 2012-09-29 09:47:23 +02:00
Xinchen Hui
2af7a76822 Merge branch 'PHP-5.4' 2012-08-22 13:52:04 +08:00
Xinchen Hui
4e561055a4 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-22 13:49:04 +08:00
Xinchen Hui
e5bdd2c0ee Fixed bug #62885 (mysqli_poll - Segmentation fault) 2012-08-22 13:41:47 +08:00
Nikita Popov
294e7c295f Annother attempt at fixing the mysqli_fetch_field tests 
Instead of character set detection (which doesn't always work correctly)
fetch the character set info using mysqli_get_charset(). To make sure that
the returned info applies to all of client, connection and result
explicitely set utf8 as charset using mysqli_set_charset() before. I'm not
sure whether that last part is really necessary, but included it to be
safe.
 2012-08-17 19:47:59 +02:00
Nikita Popov
8cccc5c37d Revert "Try to fix mysqli_field tests" 
This reverts commit 018395efaf.

This change didn't really make sense in hindsight. Looking for some other
fix.
 2012-08-16 21:56:48 +02:00
Nikita Popov
018395efaf Try to fix mysqli_field tests 
Those tests seem to fail when people have a different default collation, so
try to fix by specifying utf8_general_ci explicitely.
 2012-08-15 14:50:24 +02:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
 2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
andrey
dec56ca1e3 Merge branch 'PHP-5.4' 2012-05-16 16:00:17 +02:00
andrey
4d2d8e8717 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/mysqlnd/mysqlnd_ps.c

merge fix for bug#62046
 2012-05-16 15:59:39 +02:00
andrey
d4afbd487a Fix for bug#62046 
Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to
mysqli_stmt_reset().

Stmt's state was changed to STMT_PREPARED and leads the driver to think
that the stmt was just prepared. Because result set exist also for only
prepared but not executed sets, the check for stmt->result isn't any good.
There is a result set, because as response for COM_PREPARE the server sends
metadata and metadata is part of a result set. After COM_EXECUTE the server
sends metadata again, which could be different and in this case more correct.
 2012-05-16 14:28:55 +02:00
zoe slattery
129c830562 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Changes to remaining two tests, #62022
 2012-05-15 14:40:49 +01:00
zoe slattery
63401268db Changes to remaining two tests, #62022 2012-05-15 14:39:51 +01:00
andrey
b850fa14e0 phoenix from the ashes 2012-05-03 13:34:26 +02:00
andrey
522595086b Remove support for local infile handler in mysqli from 5.5 
This removes the following functions from the API:
mysqli_set_local_infile_default()
mysqli_set_local_infile_handler()

Using these functions is known to be lead to stability problems in
mysqli. It was only enabled when compiling against libmysql. mysqlnd
doesn't have this support for local infile. However, with mysqlnd it can
be emulated by using stream handlers like in:

$c->query("LOAD DATA LOCAL INFILE "http://example.com/import.csv" INTO ...")
All available protocols, as well as user implemented ones can be added.
 2012-05-03 12:55:03 +02:00
Ulf Wendel
8665e02ccd Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Ulf Wendel
18a4e93877 Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Ulf Wendel
0fde9acd12 Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Andrey Hristov
4dfd69e84b fix for 5.5.19 2011-12-14 19:29:45 +00:00
Andrey Hristov
e385335db2 fix for 5.5.19 2011-12-14 19:29:45 +00:00
Andrey Hristov
2f0d084ab8 fix for 5.5.19 2011-12-14 19:29:45 +00:00
Andrey Hristov
9e14665237 another fix 2011-12-14 19:28:41 +00:00
Andrey Hristov
d671f26c46 another fix 2011-12-14 19:28:41 +00:00