archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
97643 commits 526 branches 1434 tags 878 MiB
Commit graph

368 commits

Author SHA1 Message Date
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
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
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
c9357f82d3 Format string fixes 
Conflicts:
	ext/pgsql/pgsql.c
 2016-02-14 14:45:53 +01: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
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
Dmitry Stogov
4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Dmitry Stogov
70c86732cb Use zend_string to represent pdo_column_data.name and avoid duplication. 2015-05-05 16:19:51 +03:00
Christopher Jones
7ba353ef69 Add unique prefix to exported function 2015-05-02 10:03:30 -07:00
Christopher Jones
be806eba80 Export free_statement to replace php_pdo_stmt_delref which was deleted in 9fe8531309 along with php_pdo_stmt_addref 2015-05-01 18:17:34 -07:00
Nikita Popov
6202e2860d Fix leak of Pdo object if query() fails 
Decref the DBH object when storing the errored query statement --
the DBH owns the stmt, so it will live long enough.
 2015-04-16 21:08:29 +02:00
Nikita Popov
32ab26182b Fix leak of FETCH_INTO object 2015-04-16 21:08:29 +02:00
Nikita Popov
3d7959c87b Fix PdoRow leak 
PdoStatement should only hold a weakref to the PdoRow.
 2015-04-16 21:08:29 +02:00
Dmitry Stogov
ea09a9fa32 Convert fatal errors into EngineExceptions 
Make zval_update_constant_ex(), zval_update_constant(), zend_update_class_constants() and zend_ast_evaluate() return SUCCESS or FAILURE.
 2015-04-02 02:05:25 +03:00
Dmitry Stogov
1018f462d8 Patch improvement: 
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
 2015-03-30 18:53:38 +03:00
Danack
6b232643e5 Reverted change to function name and added note of why it is different from the class it is actually changing. 2015-03-15 18:03:08 +00:00
Danack
b00cd68d74 Fixed PDORow behaviour and message. 2015-03-01 02:37:57 +00:00
Dmitry Stogov
9e70d7672d Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced. 2015-02-04 15:24:13 +03:00
Michael Wallner
bd06f8bb5f fix warnings 2015-01-30 20:08:17 +01:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
e112f6a04e second shot on removing TSRMLS_* 2014-12-14 14:07:59 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Guilherme Blanco
094d409b3d Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before. 2014-12-12 17:29:54 +01:00
Julien Pauli
4bf299a250 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
 2014-11-29 11:39:37 +01:00
Julien Pauli
1813fe9f38 Merge branch 'pull-request/656' into PHP-5.5 
* pull-request/656:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
 2014-11-29 11:38:57 +01:00
Popa Marius Adrian
cf2cd8fb20 PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1 
cleanup and PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
 2014-11-29 11:38:36 +01:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Xinchen Hui
6771f5590c Another fix for test fail 2014-11-13 14:23:25 +08:00
Xinchen Hui
241b1a7840 Revert "Fixed test fails (prop read always has a IS_STRING member now)" 
This reverts commit 39913c4cdf.
 2014-11-13 14:16:08 +08:00
Xinchen Hui
39913c4cdf Fixed test fails (prop read always has a IS_STRING member now) 2014-11-13 12:47:03 +08:00
Nikita Popov
df79b9b27a Update get_class_name semantics 
* get_class_name is now only used for displaying the class name
   in debugging functions like var_dump, print_r, etc. It is no
   longer used in get_class() etc.
 * As it is no longer used in get_parent_class() the parent
   argument is now gone. This also fixes incorrect parent classes
   being reported in COM.
 * get_class_name is now always required (previously some places
   made it optional and some required it) and is also required
   to return a non-NULL value.
 * Remove zend_get_object_classname. This also fixes a number of
   potential leaks due to incorrect usage of this function.
 2014-10-09 20:48:27 +02:00