1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00
Commit Graph

158 Commits

Author SHA1 Message Date
Anatol Belski b869f22c4b Merge branch 'PHP-7.1'
* PHP-7.1:
  fix dir separator
  Update NEWS for the build
2016-12-01 01:37:24 +01:00
Anatol Belski 60c875b072 fix dir separator 2016-12-01 01:36:29 +01:00
Anatol Belski 6bf85617c5 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fix bug #73498
  Add a test for bug 73498
2016-11-22 00:47:30 +01:00
Anatol Belski fc7d6e3ba5 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug #73498
  Add a test for bug 73498
2016-11-22 00:46:54 +01:00
Anatol Belski 58aa1a70a0 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix bug #73498
  Add a test for bug 73498
2016-11-22 00:46:03 +01:00
Craig Duncan d36d4c70d3 Add a test for bug 73498 2016-11-22 00:42:45 +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
Xinchen Hui 9254f5d5d3 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #72629 (Caught exception assignment to variables ignores references).

Conflicts:
	main/php_version.h
2016-07-20 17:00:09 +08:00
Xinchen Hui 97c0b133c5 Fixed bug #72629 (Caught exception assignment to variables ignores references). 2016-07-20 16:59:14 +08:00
Anatol Belski 4a142af316 fix test portability 2016-06-17 17:09:42 +02:00
Xinchen Hui 3b0a6dfeb2 Merge branch 'PHP-7.0'
* PHP-7.0:
  No sure why this is failed in travis
2016-05-31 17:23:03 +08:00
Xinchen Hui 953ee61a49 No sure why this is failed in travis 2016-05-31 17:22:47 +08:00
Xinchen Hui 9bf3b03e73 Merge branch 'PHP-7.0'
* PHP-7.0:
  Attempt to fix tests fails
2016-05-31 16:48:33 +08:00
Xinchen Hui 072bc589fc Attempt to fix tests fails 2016-05-31 16:48:19 +08:00
Anatol Belski ed2ec7be80 Merge branch 'PHP-7.0'
* PHP-7.0:
  workaround the extra new line in the test out on another env
2016-05-12 12:49:31 +02:00
Anatol Belski 9f50bb5bfa workaround the extra new line in the test out on another env 2016-05-12 12:45:04 +02:00
Anatol Belski 00390449c6 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #72197 pg_lo_create arbitrary read
2016-05-12 11:41:18 +02:00
Anatol Belski 7f6e285430 Fixed bug #72197 pg_lo_create arbitrary read 2016-05-12 11:40:28 +02:00
Xinchen Hui 28f35c1799 Merge branch 'PHP-7.0'
* PHP-7.0:
  Committed by accident
2016-05-12 13:40:32 +08:00
Xinchen Hui 92828ae204 Committed by accident 2016-05-12 13:40:22 +08:00
Xinchen Hui 8fd92e0518 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free)
2016-05-12 13:15:57 +08:00
Xinchen Hui 3c0341e6f9 Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free) 2016-05-12 13:15:33 +08:00
Anatol Belski 148fa6bb44 Merge branch 'PHP-7.0'
* PHP-7.0:
  Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor"
  Revert "Backport patch for bug #71820"
2016-05-09 17:29:56 +02:00
Anatol Belski fc2a45b70a Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor"
This reverts commit b4eedd128b.

This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
2016-05-09 17:25:53 +02:00
Anatol Belski 1cc536af5a Revert "Backport patch for bug #71820"
This reverts commit 1b632cfe83.

This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
2016-05-09 17:15:40 +02:00
Anatol Belski e015faaf8f Merge branch 'PHP-7.0'
* PHP-7.0:
  Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification
  Add test for bug #72028
2016-04-16 19:25:13 +02:00
Anatol Belski fd6f7b8341 Add test for bug #72028 2016-04-16 16:11:22 +02:00
Anatol Belski fd2cd35429 Merge branch 'PHP-7.0'
* PHP-7.0:
  update NEWS
  Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp
2016-04-15 13:42:04 +02:00
Anatol Belski d263616525 Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp 2016-04-15 13:38:49 +02:00
Anatol Belski 672d0eeecf Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #71998 Function pg_insert does not insert when column type = inet
2016-04-10 18:49:38 +02:00
Anatol Belski b4ab0effc7 Fixed bug #71998 Function pg_insert does not insert when column type = inet 2016-04-10 18:48:35 +02:00
Anatol Belski 1b632cfe83 Backport patch for bug #71820
Rev b4eedd128b
2016-03-17 14:28:58 +01:00
Anatol Belski ad7e1768aa Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #71820 pg_fetch_object bind parameters before call constructor
2016-03-17 12:49:34 +01:00
Anatol Belski b4eedd128b Fixed bug #71820 pg_fetch_object bind parameters before call constructor
If we want to fetch into an object of a custom class that implemens
__set handler, the corstructor has to be called first. The data
passed to the constructor can be possibly required in __set handler.
2016-03-17 12:41:55 +01:00
Yasuo Ohgaki 5835593dfc Improve FR #31021 implementation (pg_last_notice() is needed to get all notice messages).
Now pg_last_notice() can clear stored notices.
2015-12-18 13:04:34 +09:00
Yasuo Ohgaki 57d9da8790 Implemented FR #31021 (pg_result_notice() is needed to get all notice messages). 2015-12-17 07:31:19 +09:00
Remi Collet 1ad58ce12e Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test description
  Fixed Buf #68812 Unchecked return value.
  Fixed Buf #68812 Unchecked return value.
2015-06-09 09:14:05 +02:00
Remi Collet 5eecc6bcde Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test description
  Fixed Buf #68812 Unchecked return value.
2015-06-09 09:13:19 +02:00
Remi Collet b347f2c47a fix test description 2015-06-09 09:12:59 +02:00
Remi Collet e0cd1823ec Merge branch 'PHP-5.6'
* PHP-5.6:
  move test
2015-05-20 14:03:01 +02:00
Remi Collet 59a78d48f0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  move test
2015-05-20 14:02:25 +02:00
Remi Collet 3be4e5d71a move test 2015-05-20 14:02:13 +02:00
Dmitry Stogov b71fbade32 Fixed test 2015-04-08 16:29:29 +03:00
Xinchen Hui e017f35b7f Merge branch 'PHP-5.6'
Conflicts:
	ext/pgsql/pgsql.c
2015-02-14 22:20:33 +08:00
Xinchen Hui 1db720cd6d Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	ext/pgsql/pgsql.c
2015-02-14 22:18:13 +08:00
Xinchen Hui 40a94597ae Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5 2015-02-14 22:03:53 +08:00
William Felipe Welter b64f149176 Test case Bug #68638 pg_update() fails to store infinite values 2015-02-05 13:19:52 -02:00
Yasuo Ohgaki 30b4a32e09 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed Bug #65199 pg_copy_from() modifies input array variable

Conflicts:
	ext/pgsql/pgsql.c
2015-02-03 15:40:59 +09:00
Yasuo Ohgaki 36f73412c1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #65199 pg_copy_from() modifies input array variable
2015-02-03 15:27:19 +09:00
Yasuo Ohgaki f8a8ccaba2 Fixed Bug #65199 pg_copy_from() modifies input array variable 2015-02-03 15:26:02 +09:00