Commit graph

421 commits

Author SHA1 Message Date
Xinchen Hui
3f1e9ed8f8 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72788 (Invalid memory access when using persistent PDO connection)
  Remove typo'd commit
  Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
2016-08-09 11:32:34 +08:00
Xinchen Hui
ebd21de1e4 Merge branch 'bug72788' of https://github.com/keyurdg/php-src into PHP-7.0
* 'bug72788' of https://github.com/keyurdg/php-src:
  Remove typo'd commit
  Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
2016-08-09 11:25:32 +08:00
Keyur
3f25c4228a Fix bug 72788: Invalid memory access when database_object_handle
is undefined. Also fix memory leak in dbh_free when using persistent
PDO connections.
2016-08-09 00:16:46 +00:00
Matteo Beccati
70698d1566 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Clean up FR #72633
  Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.

Conflicts:
	ext/oci8/package.xml
2016-08-04 09:37:40 +02:00
Matteo Beccati
4003595d60 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Clean up FR #72633
2016-08-04 09:30:48 +02:00
Matteo Beccati
d3a8e107ac Clean up FR #72633 2016-08-04 09:28:58 +02:00
Anatol Belski
40b3a031b2 cleanup table after test 2016-08-02 14:35:24 +02:00
Pablo Santiago Sánchez
90c6cbd09b - lastInsertId using Postgres Lastval() function 2016-08-02 14:34:30 +02:00
Anatol Belski
915d2b9420 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  cleanup the table after the test run
2016-07-27 23:53:19 +02:00
Anatol Belski
266c62070f cleanup the table after the test run 2016-07-27 23:50:10 +02:00
Anatol Belski
fb244637c6 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Implemented FR #72633 Postgres PDO lastInsertId() should work without specifying a sequence
2016-07-27 23:03:23 +02:00
root
12628e9a46 Implemented FR #72633 Postgres PDO lastInsertId() should work without specifying a sequence 2016-07-27 23:00:12 +02:00
Anatol Belski
ce555fd1d6 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix test out
2016-07-19 15:07:10 +02:00
Anatol Belski
8e0594a944 fix test out
this test also affected by #70313 which is not in the release branch
2016-07-19 15:05:14 +02:00
Stanislav Malyshev
70d6ce3368 Merge branch 'PHP-7.0'
* PHP-7.0: (27 commits)
  fix #72519, possible OOB using imagegif
  fix #72512, invalid read or write for palette image when invalid transparent index is used
  Apparently some envs miss SIZE_MAX
  Fix tests
  Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
  Partial fix for bug #72613 - do not allow reading past error read
  Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
  Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
  Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
  Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
  update NEWS
  Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
  Fix bug #72562 - destroy var_hash properly
  Fix bug #72551 and bug #72552 - check before converting size_t->int
  Fix bug #72541 - size_t overflow lead to heap corruption
  Fix bug #72533 (locale_accept_from_http out-of-bounds access)
  Fix fir bug #72520
  Fix for bug #72513
  Fix for bug #72513
  CS fix and comments with bug ID
  ...

Conflicts:
	ext/standard/basic_functions.c
2016-07-19 01:44:14 -07:00
Stanislav Malyshev
e9a58bee24 Merge branch 'PHP-7.0.9' into PHP-7.0
* PHP-7.0.9:
  Partial fix for bug #72613 - do not allow reading past error read
  update NEWS
  Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
  Fix bug #72551 and bug #72552 - check before converting size_t->int
  Fix bug #72541 - size_t overflow lead to heap corruption
  fix possible optimization bug
  set versions

Conflicts:
	configure.in
	ext/pdo_pgsql/tests/bug72570.phpt
	main/php_version.h
2016-07-19 01:08:18 -07:00
Matteo Beccati
0f182c2495 Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
Special commit for 7.0.9
2016-07-14 12:05:40 +02:00
Matteo Beccati
445cb529b2 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
  Fixed bug #70313 PDO statement fails to throw exception
2016-07-10 14:38:17 +02:00
Matteo Beccati
4d677ae0e2 Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders 2016-07-10 14:36:07 +02:00
Matteo Beccati
11d74b5b79 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #70313 PDO statement fails to throw exception
2016-07-10 14:34:59 +02:00
Matteo Beccati
219ebcb689 Fixed bug #70313 PDO statement fails to throw exception 2016-07-10 14:33:56 +02:00
Dmitry Stogov
323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Dmitry Stogov
1616038698 Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Anatol Belski
2ca86bb860 Merge branch 'PHP-7.0'
* PHP-7.0:
  Add test for bug #72294
  Fixed bug #72294 Segmentation fault/invalid pointer in connection with pgsql_stmt_dtor
2016-06-01 11:57:00 +02:00
Anatol Belski
79b978db9a Add test for bug #72294 2016-06-01 11:55:35 +02:00
Anatol Belski
af8fa8e937 Fixed bug #72294 Segmentation fault/invalid pointer in connection with pgsql_stmt_dtor 2016-06-01 11:55:35 +02:00
Xinchen Hui
5717faa1e5 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed test (keyword is local related)
2016-05-31 16:56:12 +08:00
Xinchen Hui
47fa763fae Fixed test (keyword is local related) 2016-05-31 16:55:58 +08:00
Xinchen Hui
233562c2da Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound)
2016-05-11 11:12:46 +08:00
Xinchen Hui
66ad4fc393 Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound) 2016-05-11 11:12:27 +08:00
Anatol Belski
31abb8ab50 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix merge mistake
2016-04-06 18:06:40 +02:00
Anatol Belski
6489edb958 fix merge mistake 2016-04-06 18:05:39 +02:00
Anatol Belski
fc90ddf1f3 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix tests
  PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
  fix indent
2016-04-06 17:45:31 +02:00
Anatol Belski
26f9aa7211 fix tests 2016-04-06 17:43:49 +02:00
Petr Sýkora
aeb9c81c09 PostgreSQL's PDOStatement::getColumnMeta() fills in table's name. 2016-04-06 17:43:49 +02:00
Anatol Belski
052c1d337c fix indent 2016-04-06 17:43:49 +02:00
Anatol Belski
9056a36c9b Merge branch 'PHP-7.0'
* PHP-7.0:
  add 32-bit specific variont for #62498
  skip test on 32-bit
2016-04-06 14:07:03 +02:00
Anatol Belski
4f7d89a335 add 32-bit specific variont for #62498 2016-04-06 14:05:25 +02:00
Anatol Belski
02fc9cb31f skip test on 32-bit
The Postgres INT8 datatype is handled as string on 32-bit
2016-04-06 13:55:32 +02:00
Anatol Belski
ea4d27f47c Merge branch 'PHP-7.0'
* PHP-7.0:
  update NEWS
  fix and extend test
  Don't roundtrip to the database to get the column type if you already know it
2016-04-05 15:13:17 +02:00
Anatol Belski
c2cb4664bc fix and extend test 2016-04-05 15:06:17 +02:00
Joe Bylund
e10257ba80 Don't roundtrip to the database to get the column type if you already know it
add_assoc_string now takes just three args

nikic's fix to move pqclear outside the if, would be a possible memory leak inside the if

(joe) check behavior of getColumnMeta
2016-04-05 15:03:04 +02:00
Nikita Popov
93dc91b386 Remove version checks
PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2

I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.
2016-01-30 15:35:28 +01:00
Xinchen Hui
36b4311edd Do not edit the value in place (might be relates to #71261) 2016-01-04 05:38:15 -08:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Anatol Belski
1184f0aca5 add test for bug #70861 2015-11-05 19:48:08 +01:00
Anatol Belski
5ba763413b fix test redirection when run not from source root 2015-10-23 09:42:19 +02:00
Dmitry Stogov
560e4fa393 Removed or simplified incorrect SEPARATE_*() macros usage. 2015-09-29 11:17:43 +03:00
Anatol Belski
b460b530d6 fix test
backport from master
2015-08-23 17:27:53 +02:00