mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
89,995 Commits 500 Branches 1,381 Tags 798 MiB
6bd4c3e17d
Commit Graph

495 Commits

Author SHA1 Message Date
Anatol Belski
2d78023244 cleanup the mod version macros, round 2 2015-03-23 20:33:54 +01:00
Reeze Xia
609f05fc19 ZTS cleanup 2015-03-08 19:25:55 +08:00
Popa Adrian Marius
3e6380d64b Use Firebird default home folder, replace Interbase with Firebird 2015-02-24 13:58:14 +02:00
Anatol Belski
af3ca74501 made ZEND_TSRMLS_CACHE_* macros look like function calls 
which also comply with the current semantics for such macros
 2015-02-16 17:19:32 +01:00
Popa Adrian Marius
8f968c5416 Apply PHP7 firebird fixes after API Cleanup from 8c920a22ac 2015-02-13 17:55:17 +02:00
Michael Wallner
0d267bdecc Merge branch 'close_cor' of github.com:MegaManSec/php-src 
* 'close_cor' of github.com:MegaManSec/php-src:
  Fix interbase va_start
 2015-01-30 23:05:10 +01:00
Popa Adrian Marius
b9868f23a0 fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed 2015-01-28 15:39:42 +02:00
Joshua Rogers
5863855758 Fix interbase va_start 2015-01-27 09:50:16 +11:00
Popa Adrian Marius
56c5b8e399 Revert "Remove Jouni Ahto from maintainers and files as requested , anyway we have git blame/history" 
This reverts commit 7cf1450df1.
 2015-01-22 10:16:51 +02:00
Popa Adrian Marius
7cf1450df1 Remove Jouni Ahto from maintainers and files as requested , anyway we have git blame/history 2015-01-21 18:08:56 +02:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +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
Popa Adrian Marius
899c24a8c1 cleanup comments from svn/cvs era 2014-11-24 18:40:20 +02:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Anatol Belski
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
Florian MARGAINE
8eb7e7bf7f Merge branch 'master' into issue-67910 
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
 2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Xinchen Hui
b2d2b965b2 resource type is int 2014-08-29 11:28:21 +08:00
Popa Adrian Marius
e41754b7d8 rename misleading define 2014-08-28 18:20:28 +03:00
Popa Adrian Marius
59286f89f7 solve conflicting type size_t vs int 2014-08-28 17:10:42 +03: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
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Xinchen Hui
1f10013ac4 Fixed invalid free 2014-07-30 11:21:40 +08:00
Dmitry Stogov
21dec5f511 ext/interbase support (incomplete) 2014-07-29 10:15:01 +04:00
Dmitry Stogov
cd4b4dfc4d Merge branch 'master' into refactoring2 
Conflicts:
	Zend/zend_hash.c
	ext/date/php_date.c
 2014-05-05 13:02:43 +04:00
Anatol Belski
149568f4da Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed ZEND_DEBUG usage
 2014-05-05 00:51:40 +02:00
Anatol Belski
0d5121a3c7 fixed ZEND_DEBUG usage 2014-05-05 00:50:51 +02: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
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Popa Adrian Marius
c2ce0df01b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Cleanup $ is not needed for git
 2014-04-10 17:43:45 +03:00
Popa Adrian Marius
1a0b80fe90 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Cleanup $ is not needed for git
 2014-04-10 17:43:09 +03:00
Popa Adrian Marius
1c3ed86211 Cleanup $ is not needed for git 2014-04-10 17:42:32 +03:00
Popa Adrian Marius
8abcd97333 cleanup old unsupported versions of Firebird 1.0.x 2014-04-08 17:36:38 +03:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
69a4301f6c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc Remove executable permission on inc 2012-10-10 10:44:34 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00