clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
97,523 Commits 491 Branches 1,363 Tags 846 MiB
3f1e9ed8f8
Commit Graph

992 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
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
Nikita Popov
9452257b04 Fix leak in PDO row_get_ctor 
The __construct function name was leaked. Avoid this by simply
throwing directly from row_get_ctor instead of indirecting through
an actual __construct function.
 2016-07-16 23:16:26 +02:00
Julien Pauli
661b560c5f Merge branch 'PHP-7.0' 
* PHP-7.0:
  Updated NEWS
  Updated NEWS
  Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
  Revert "Fix test for #52384"

Conflicts:
	ext/pdo/pdo_stmt.c
 2016-07-12 15:54:39 +02:00
Julien Pauli
152d53c844 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
  Revert "Fix test for #52384"

Conflicts:
	ext/pdo/pdo_stmt.c
 2016-07-12 15:50:58 +02:00
Julien Pauli
822498128b Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT." 
This reverts commit 15336b44d9.
 2016-07-12 15:46:07 +02:00
Julien Pauli
5cce0d7c7c Revert "Fix test for #52384" 
This reverts commit 642e44b98f.
 2016-07-12 15:45:49 +02:00
Julien Pauli
8ca401f1b2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix test for #52384
 2016-07-12 15:28:13 +02:00
Julien Pauli
c96a9ca6f5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix test for #52384
 2016-07-12 15:27:57 +02:00
Julien Pauli
642e44b98f Fix test for #52384 2016-07-12 15:27:37 +02:00
Julien Pauli
1a7e39a469 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Updated NEWS
  Updated NEWS
  Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT.

Conflicts:
	ext/pdo/pdo_stmt.c
 2016-07-12 11:25:20 +02:00
Julien Pauli
ec28576260 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT.

Conflicts:
	ext/pdo/pdo_stmt.c
 2016-07-12 11:17:36 +02:00
Bishop Bettini
15336b44d9 Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT. 2016-07-12 10:47:07 +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
Dmitry Stogov
6499162ff0 - get rid of EG(scope). zend_get_executed_scope() should be used instead. 
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
 2016-04-28 04:13:34 +03:00
Dmitry Stogov
f0a2e8eb13 Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used. 2016-04-27 13:46:38 +03:00
Matteo Beccati
b68e89ee7e Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71447 (Quotes inside comments not properly handled)
  Fixed a few PDO tests to conform to PDO Common standards
  news entry #69537
  Fix #69537: __debugInfo with empty string for key gives error
 2016-04-05 00:07:28 +02:00
Matteo Beccati
4090e709aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #71447 (Quotes inside comments not properly handled)
  Fixed a few PDO tests to conform to PDO Common standards
  news entry #69537
  Fix #69537: __debugInfo with empty string for key gives error

Conflicts:
	Zend/zend_compile.c
 2016-04-05 00:07:02 +02:00
Matteo Beccati
30925cd498 Fixed bug #71447 (Quotes inside comments not properly handled) 2016-04-04 23:50:28 +02:00
Matteo Beccati
9a87108eca Fixed a few PDO tests to conform to PDO Common standards 2016-04-04 23:43:17 +02:00
Julien Pauli
8bf5a60fdd Merge branch 'PHP-7.0' 
* PHP-7.0:
  Updated NEWS
  Updated NEWS
  Reworked Fix bug #52098
  Fix bug #52098
 2016-03-21 15:40:50 +01:00
Julien Pauli
5ba7b9af1b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Reworked Fix bug #52098
  Fix bug #52098

Conflicts:
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
 2016-03-21 15:39:48 +01:00
Julien Pauli
d3d64b7c62 Reworked Fix bug #52098 2016-03-21 15:23:18 +01:00
Daniel Persson
e541cd8e6b Fix bug #52098 2016-03-21 15:04:11 +01:00
Xinchen Hui
5e2186e5a7 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex
 2016-03-18 11:50:38 +08:00
Xinchen Hui
5b8d0dc6ae Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex 2016-03-18 11:50:03 +08:00
Dmitry Stogov
c67c166f93 Removed zend_fcall_info.symbol_table 2016-03-02 17:50:55 +03:00
Nikita Popov
2d605e5f24 Merge branch 'PHP-7.0' 2016-02-14 14:47:42 +01:00
Nikita Popov
c9357f82d3 Format string fixes 
Conflicts:
	ext/pgsql/pgsql.c
 2016-02-14 14:45:53 +01:00
Lior Kaplan
85ce6a7d38 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Align spacing in make install messages
 2016-02-08 20:33:17 +02:00
Lior Kaplan
fb7d673ef2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393
 2016-02-08 20:29:24 +02:00
Lior Kaplan
6772fbff62 Align spacing in make install messages 2016-02-08 20:27:19 +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
Nikita Popov
2eb4728611 Remove HAVE_SPL checks 
SPL is always built.

Also clean up spl_ce_RuntimeException handling in PDO.
 2016-01-30 14:53:00 +01:00
Xinchen Hui
ae122bf7ad Fixed warning of incompatible pointer 2016-01-23 22:49:15 -08:00
Dmitry Stogov
6a2621e3a5 Avoid incomplete zend_internal_function initialization. 2016-01-13 15:06:17 +03: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
Fabian Franz
1fcadf67e6 Fix setting of empty string resource. 2015-11-05 19:47:12 +01:00
Anatol Belski
a80545992b update the actual sql parser file for #70861 2015-11-05 14:46:40 +01:00
Anatol Belski
5c96a91d77 Fix bug #70861 Segmentation fault in pdo_parse_params() during Drupal 8 test suite 2015-11-05 14:46:28 +01:00
Daniel Persson
73384728ca Fix bug #64172 
Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.
 2015-10-18 17:06:54 -07:00
Daniel Persson
307c1f6bf0 Fix bug #64172 
Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.
 2015-10-18 17:03:39 -07:00
Dmitry Stogov
d82ea930ed Cleanup: removed deprecated commented code. Incorrect zval_dtor() usage replaced by zval_dtor_ptr(). 2015-09-23 01:32:30 +03:00
Xinchen Hui
014abbc840 Merge branch 'PHP-5.6' 
Conflicts:
	ext/pdo/pdo_dbh.c
	ext/pdo/php_pdo_driver.h
 2015-08-30 05:32:37 -07:00
Xinchen Hui
ef1bd8f0e6 Fixed bug #70389 (PDO constructor changes unrelated variables) 2015-08-30 05:02:38 -07:00
Xinchen Hui
aaf7638706 Fixed bug #70221 (persistent sqlite connection + custom function segfaults) 2015-08-10 19:00:35 +08:00
Christopher Jones
a3c54dd1b7 Add Oracle syntax (Senthil) 2015-07-10 09:47:45 +10:00