1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Commit Graph

271 Commits

Author SHA1 Message Date
Anatol Belski ef9922faa9 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix curl tests wrt. AppVeyor and curl updates
2018-05-18 17:44:48 +02:00
Anatol Belski e470068293 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix curl tests wrt. AppVeyor and curl updates
2018-05-18 17:43:58 +02:00
Anatol Belski b2429259af Fix curl tests wrt. AppVeyor and curl updates 2018-05-18 17:39:12 +02:00
Gabriel Caruso b895690dfa remove support for string|unicode in tests 2018-02-22 08:11:30 +01:00
Gabriel Caruso ded3d984c6 Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
2018-02-20 21:53:48 +01:00
Gabriel Caruso b8bb4d77ca Remove empty sections in tests 2018-02-14 11:10:59 +01:00
Gabriel Caruso 21e3b0c70c Remove trailing whitespace in inc files 2018-02-10 19:20:23 +01:00
Gabriel Caruso fef879a2d6 Use bool instead of boolean while throwing a type error
PHP requires boolean typehints to be written "bool" and disallows
"boolean" as an alias. This changes the error messages to match
the actual type name and avoids confusing messages like "must be
of type boolean, boolean given".

This a followup to ce1d69a1f6, which
implements the same change for integer->int.
2018-02-04 23:09:40 +01:00
Gabriel Caruso ce1d69a1f6 Use int instead of integer in type errors
PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".
2018-02-04 19:08:23 +01:00
Stanislav Malyshev 3616b6b935 Cleanup some tests - remove unnecessary sections
Also unify credits - all are under --CREDITS-- now.
2018-02-04 02:21:40 -08:00
Anatol Belski 7892eaf075 Merge branch 'PHP-7.2'
* PHP-7.2:
  Unify EOL
  Extend test, latest cURL ships also with smb and smbs
2018-01-12 12:22:35 +01:00
Anatol Belski baaf73be69 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Unify EOL
  Extend test, latest cURL ships also with smb and smbs
2018-01-12 12:21:43 +01:00
Anatol Belski 9d2662ea4b Unify EOL 2018-01-12 12:20:31 +01:00
Anatol Belski 4bb46c133d Extend test, latest cURL ships also with smb and smbs 2018-01-12 12:17:57 +01:00
Matt Piskorz 1534ab3fc2 Add test for curl_mutli_close on non curl multi resource 2017-09-06 10:00:18 +01:00
Barry O Sullivan a1a949d89c Add test for curl_share_close 2017-08-04 12:41:08 +01:00
Anatol Belski 6508320936 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  deps updated, cherry-pick 88642decf9
  add test for bug #74230
2017-03-27 19:42:24 +02:00
Anatol Belski ee8b5de5a0 deps updated, cherry-pick 88642decf9 2017-03-27 19:38:20 +02:00
Anatol Belski 88642decf9 fix test, yet master staging only 2017-02-24 11:44:39 +01:00
Joe Watkins 28391c30ca Merge branch 'PHP-7.1'
* PHP-7.1:
  Increase wait time for tests involving sockets to improve Travis relability
2017-01-13 06:45:31 +00:00
Joe Watkins 19363de12f Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability
2017-01-13 06:45:17 +00:00
Mitch Hagstrand fd92b91188 Increase wait time for tests involving sockets to improve Travis relability
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
2017-01-13 06:45:04 +00:00
Joe Watkins ba0751a915 Merge branch 'pull-request/1809'
* pull-request/1809:
  test for function curl_multi_info_read();
2017-01-06 08:06:38 +00:00
Joe Watkins 3d50172e9e Merge branch 'pull-request/1809'
* pull-request/1809:
  test for function curl_multi_info_read();
2017-01-06 08:06:10 +00:00
Joe Watkins a319e09e87 Merge branch 'pull-request/1809'
* pull-request/1809:
  test for function curl_multi_info_read();
2017-01-06 08:04:49 +00:00
Nikita Popov 1bf67622f8 Merge branch 'PHP-7.1' 2016-12-27 21:52:56 +01:00
Nikita Popov 937115f8c5 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-27 21:52:33 +01:00
Mitch Hagstrand 2d51267c07 Makes the sapi web server and curl tests more reliable
1. Increased the time for the sapi/cli/tests/php_cli_server.inc to accept connections.
2. sapi/cli/tests/php_cli_server.inc has errors messages and a `stop` function.
3. bug67429.phpt uses the `stop` function to shutdown the webserver before starting a new one.
4. Removed ext/curl/tests/bug48203_multi-win32.phpt test now that ext/curl/tests/bug48203_multi.phpt
   runs on Windows also.
2016-12-27 21:52:05 +01:00
Mitch Hagstrand 92678d1a83 Fixes the curl tests to be more reliable in Travis CI
1. Increases the amount of time for the PHP built-in server to accept a connection
2. Outputs an error if the PHP built-in server fails
3. In bug48203_multi.phpt the test no longer starts and stops multiple PHP built-in servers
2016-12-27 21:52:05 +01:00
Anatol Belski cefa9e6743 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix test
2016-12-04 17:30:03 +01:00
Anatol Belski 2198ce2f28 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix test
2016-12-04 17:29:22 +01:00
Anatol Belski 8e209d0435 fix test 2016-12-04 17:28:43 +01:00
Anatol Belski a263ca6af0 Merge branch 'PHP-7.1'
* PHP-7.1:
  fork tests
2016-12-01 14:54:21 +01:00
Anatol Belski 1c2333009f Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fork tests
2016-12-01 14:53:22 +01:00
Anatol Belski 2252d4e59d fork tests 2016-12-01 14:52:18 +01:00
Nikita Popov 5af586bec5 Remove more PHP 6 leftovers from tests 2016-11-24 22:39:39 +01:00
Nikita Popov 45f7b2bcc8 Fix CRLF line-endings in tests
Also fix a single instance of CRLF in ibase_query.c.
2016-11-20 22:31:24 +01:00
marcosptf a51d33c5d8 Update curl_multi_info_read.phpt 2016-10-26 16:43:13 -02:00
marcosptf 26ea77c8f8 Update curl_multi_info_read.phpt 2016-10-26 13:01:30 -02:00
marcosptf 26e0df7dc0 Update curl_multi_info_read.phpt 2016-10-26 12:51:07 -02:00
Stanislav Malyshev 54003ab663 Fix bug #73147: Use After Free in PHP7 unserialize()
(cherry picked from commit 0e6fe3a4c9)
(cherry picked from commit f42cbd749c)
2016-10-14 01:44:16 +02:00
Anatol Belski b1ef60f90e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug #73147: Use After Free in PHP7 unserialize()
2016-10-12 17:56:13 +02:00
Stanislav Malyshev f42cbd749c Fix bug #73147: Use After Free in PHP7 unserialize()
(cherry picked from commit 0e6fe3a4c9)
2016-10-12 17:51:15 +02:00
Pierrick Charron 3d71c1de7a Add curl_multi/share_errno() curl_share_strerror()
Add 3 new functions :
- curl_multi_errno()
- curl_share_errno()
- curl_share_strerror()

https://wiki.php.net/rfc/new-curl-error-functions
2016-06-26 13:29:42 -04:00
Dmitry Stogov b12dfbad6a Added test 2016-06-07 14:08:12 +03:00
Anatol Belski 8c74f03c10 fix test 2016-04-29 14:30:19 +02:00
Pierrick Charron 043ce195c6 Fix cURL test to use local server instead of google 2016-04-23 18:37:55 -04:00
marcosptf 38b21fc2fa Update curl_multi_info_read.phpt 2016-03-17 10:45:54 -03:00
marcosptf c66161d061 Update curl_multi_info_read.phpt 2016-03-16 18:18:04 -03:00
marcosptf 252cfa5720 Update curl_multi_info_read.phpt 2016-03-13 10:26:48 -03:00