clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 13:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,350 Commits 494 Branches 1,367 Tags 788 MiB
ed10168b30
Commit Graph

967 Commits

Author SHA1 Message Date
Danack
d3267d0092 Fixed PDO constructor to not return null. 2015-03-15 15:03:03 +00:00
Danack
043a02605f Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter. 2015-03-01 13:06:58 +00:00
Danack
b00cd68d74 Fixed PDORow behaviour and message. 2015-03-01 02:37:57 +00:00
Dmitry Stogov
1eb4352143 Use new ZEND_HASH_FOREACH_... API. 2015-02-10 15:43:12 +03:00
Matteo Beccati
b32458f0c9 Removed unused REGISTER_PDO_CONST_LONG 2015-02-08 13:31:01 +01: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
Stanislav Malyshev
598c935245 update the .re file for PDO 2015-01-27 13:48:24 -08:00
Stanislav Malyshev
0290571ccf bump the API no 2015-01-27 09:22:20 -08:00
Stanislav Malyshev
dfe6aea9ca size_t cleanup for PDO 2015-01-26 16:16:02 -08: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
Dmitry Stogov
2646f7bcb9 Don't count variadic argument in zend_func.common.num_args. This allows faster CALL/RETURN code. 2014-12-22 16:44:39 +03: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
Dmitry Stogov
5dd427eac2 Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*. 2014-12-03 16:56:09 +03: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
Nikita Popov
b09acffc04 Remove PDORow get_class_entry handler 2014-10-09 15:23:14 +02:00
Nikita Popov
e5e9d8346f Remove zend_get_class_entry function 2014-10-09 14:17:30 +02:00
Dmitry Stogov
bd9a234645 Replaced EG(This) and EX(object) with EX(This). 
Internal functions now recieves zend_execute_data as the first argument.
 2014-10-03 19:32:46 +04:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Nikita Popov
8a9dd4a1d7 Fix GMP serialization 
Also fix same issue in PDO.
 2014-09-18 23:03:27 +02:00
Anatol Belski
2ace2d1b8a reduce struct size by 8 byte on 64 bit 2014-09-17 09:16:00 +02:00
Anatol Belski
101adecbcd reduce struct sizes by 8 bytes each on 64 bit 2014-09-14 11:13:17 +02:00
Nikita Popov
9ab8605f8b Release memory for PDO Stmt ctor args 2014-09-06 12:52:51 +02:00
Nikita Popov
6cceb54c09 Fix a number of format issues 2014-09-03 15:57:28 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
6f9f0bf205 master renames phase 2 2014-08-25 19:28:33 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski
b315af1d9f fix zpp 2014-08-21 15:44:23 +02:00
Anatol Belski
cd18b5884b Merge remote-tracking branch 'php/master' 2014-08-20 23:27:26 +02:00
Dmitry Stogov
8cda420ff4 Fixed ext/pdo_*/tests/pdo_005.phpt tests failure 2014-08-20 23:28:32 +04:00
Anatol Belski
66e7090e61 Merge remote-tracking branch 'php/master' 2014-08-20 18:19:37 +02:00
Dmitry Stogov
c1b5fde606 Reverted incorrectly changed test. Now it's the same as in PHP-5.6. 2014-08-20 12:03:47 +04:00
Anatol Belski
92269d25a3 ported pdo and pdo_sqlite 2014-08-19 18:32:08 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Anatol Belski
41115d3d9d regenerated parser files 2014-08-17 21:05:20 +02:00
Xinchen Hui
d790eceb01 Fixed version id 2014-08-16 16:44:02 +08:00
Xinchen Hui
bde56debe5 Better version checking 2014-08-15 18:41:01 +08:00
Dmitry Stogov
7435fc88a6 Fixed pdo_firebird tests failures 2014-08-11 23:56:34 +04:00
Dmitry Stogov
1dd07d6bf4 Partial fix that allows internal constructors to set $this to null. 
The address of $this passed to drectly called internal constructor in execute_data->return_value.
Internal constructors should use ZEND_CTOR_MAKE_NULL() macro (insted of previous ZEND_NULL(EG(This))) to do the work.

This patch doesn't fix the problem for indirectly called constructors. e.g. parant::__construct().
 2014-07-09 11:57:42 +04:00
Dmitry Stogov
2ed8a17045 Refactored run_time_cache usage in object handlers 2014-07-07 20:54:31 +04:00
Xinchen Hui
ee30cc8a1e Fixed use of uninitialized value 2014-06-24 00:03:02 +08:00
Xinchen Hui
b42f0ce5c4 Fixed segfault (we need to close it for it has referenced by somewhere) 2014-06-23 17:00:18 +08:00
Xinchen Hui
2a06902488 Fixed compiler warning 2014-06-23 15:48:19 +08:00
Xinchen Hui
c135ca0a9d Actually, I don't know how it works. (maybe I should re-start again :<) 2014-06-23 15:35:53 +08:00
Xinchen Hui
80108a1607 Fixed PDO_PARAM_ZVAL 2014-06-20 11:40:53 +08:00
Dmitry Stogov
b108267f2c Merge branch 'master' into phpng 
* master: (41 commits)
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
  Fix patch for bug #67436
  fix failed test
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
  Added tests for bug 67436
  Fixed wrong XFAIL test - already fixed
  Fix typo in Bug #67406 NEWS entry
  Fix typo in Bug #67406 NEWS entry
  ...

Conflicts:
	Zend/zend_compile.c
	ext/session/session.c
	ext/standard/array.c
	ext/standard/http_fopen_wrapper.c
	tests/classes/bug63462.phpt
 2014-06-18 17:50:27 +04:00
Lior Kaplan
11b18347d8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:32:10 +03:00
Lior Kaplan
c38b73a701 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:30:44 +03:00
Lior Kaplan
e667d23178 Update copyright year for re2c files as well 2014-06-16 23:26:50 +03:00
Dmitry Stogov
864aa7746f Fixed refcounting 2014-05-28 01:28:38 +04:00
Xinchen Hui
9fa9da4831 Finished persistent PDO implement 2014-05-26 14:17:45 +08:00
Xinchen Hui
e1317ed517 Refactored ext/ldap 2014-05-20 11:26:26 +08:00
Xinchen Hui
204e580fcd Fixed Hash API usage 2014-05-18 20:25:07 +08:00
Xinchen Hui
af3829608d Fixed Hash API usage 2014-05-18 20:23:26 +08:00
Xinchen Hui
4ababc3a41 Fixed Hash API usage (it's in comments) 2014-05-18 12:09:14 +08:00
Pierre Joye
5939345fd5 Merge branch 'phpng' of git.php.net:php-src into phpng 
# By Dmitry Stogov (5) and Xinchen Hui (3)
# Via Xinchen Hui (3) and Dmitry Stogov (2)
* 'phpng' of git.php.net:php-src:
  Fixed signed
  Refactoring socket (only compilable now)
  it make no sense to create a reference to object
  Initialize zvals
  Fixed <any> with XML references
  Refactored shmop
  Fixed pointer mess (use * instead of **)
  Fixed support for XML references
 2014-05-17 05:42:00 +02:00
Pierre Joye
9b44d687df fix zend_hash_get_current_data_ptr_ex call 2014-05-17 05:41:21 +02:00
Xinchen Hui
a4a1fc5552 Fixed signed 2014-05-17 10:28:54 +08:00
Pierre Joye
8a2a9379cf used only in the #ifdef 0 2014-05-15 20:09:49 +02:00
Xinchen Hui
49df66be01 Made a little clean up 2014-05-15 22:33:13 +08:00
nikita2206
b7f6bc5103 add support for pdo-pgsql in phpng refactoring 2014-05-15 16:18:50 +04:00
Xinchen Hui
b1c9d5ddee Use strpprintf 2014-05-10 00:43:02 +08:00
Xinchen Hui
28e6a2b452 Revert "ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql" 
This reverts commit 29b3529292.
 2014-05-08 18:34:40 +08:00
Xinchen Hui
29b3529292 ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql 2014-05-08 18:30:21 +08:00
Xinchen Hui
be79628b87 Fixed REFERENCE handling 2014-05-08 16:11:50 +08:00
Xinchen Hui
5f46c8fa31 Fixed bugs in pdo_mysql 2014-05-08 15:19:43 +08:00
Dmitry Stogov
223df9ceea We shouldn't modify strings in-place (it may be interned strings stored in SHN) 2014-05-07 23:19:28 +04:00
Xinchen Hui
2d0c9690de Refactor pdo_mysql(incompleted, some tests failed due to no mysqlnd) 2014-05-07 11:00:36 +08:00
Dmitry Stogov
8915ad69fb Fixed memory leaks 2014-05-06 04:06:58 +04:00
Dmitry Stogov
1606a9a36a PDO code assumes that different parts of the union alligned in special way 2014-05-06 02:02:00 +04:00
Nikita Popov
211d32c814 Initialize CG(one_time_string) in ZTS as well 2014-05-05 22:21:57 +02:00
Xinchen Hui
c73c6526ef clean up 2014-05-05 18:09:15 +08:00
Xinchen Hui
d8651fbe1c Make they are in the same style of Z_ISREF 2014-05-03 16:08:58 +08:00
Dmitry Stogov
17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Xinchen Hui
2178612186 Fixed fetch into refcount hanlding (now 3 test fails) 2014-04-25 11:45:23 +08:00
Xinchen Hui
c5f9b86fd4 Fixed bindColumn 2014-04-25 11:36:53 +08:00
Xinchen Hui
35f22f609a Fixed memleak 2014-04-25 11:34:00 +08:00
Xinchen Hui
1ccc250c50 Fixed memleak in quote 2014-04-25 11:04:11 +08:00
Xinchen Hui
911d58de37 Fixed tests (object id) 2014-04-25 11:02:19 +08:00
Xinchen Hui
868c2f9c88 Fixed reference handling in bindCloumn 2014-04-25 11:00:35 +08:00
Xinchen Hui
67f27bce55 Fixed register bound parameters in execute 2014-04-25 10:44:21 +08:00
Xinchen Hui
36e214c88b Fixed refcount of dbh (we don't need another refcount anymore) 2014-04-25 10:27:23 +08:00
Xinchen Hui
9fe8531309 Various bugs fixed 2014-04-24 21:14:36 +08:00
Xinchen Hui
9824418c61 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-04-24 10:18:39 +08:00