clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,096 Commits 491 Branches 1,363 Tags 844 MiB
797c1660cb
Commit Graph

34937 Commits

Author SHA1 Message Date
Xinchen Hui
fca5af618f Fixed IS_INDRICT handling 2014-05-12 10:52:37 +08:00
Xinchen Hui
618d6e273c Fixed fields handling 2014-05-12 10:46:19 +08:00
Stanislav Malyshev
eaa39c9388 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
 2014-05-11 18:57:39 -07:00
Stanislav Malyshev
f2fdeba19d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
 2014-05-11 18:56:32 -07:00
Stanislav Malyshev
af5cc61cf3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
 2014-05-11 18:16:19 -07:00
Stanislav Malyshev
291b45afb5 Fix bug #67248 (imageaffinematrixget missing check of parameters) 2014-05-11 18:14:57 -07:00
Stanislav Malyshev
2b475eebbe Fix bug #67247 spl_fixedarray_resize integer overflow 2014-05-11 17:54:27 -07:00
Xinchen Hui
8d87e3b841 Refactoring wddx (incompleted, is there any one use it? ) 2014-05-11 22:04:45 +08:00
Felipe Pena
2ed2283932 Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
 2014-05-11 09:46:47 -03:00
Felipe Pena
9d8a00337d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
 2014-05-11 09:46:38 -03:00
Felipe Pena
b99862e7ae Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
 2014-05-11 09:46:25 -03:00
Felipe Pena
fb3b8de98d - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) 2014-05-11 09:45:17 -03:00
Xinchen Hui
c057b3f63d Finish refactoring of MySQLi 
a few tests failed due to knew issue, I will disscuss with dmitry later
 2014-05-11 19:37:48 +08:00
Xinchen Hui
446c60c616 Various bug fixes (now 17 tests fails, it is 11 in trunk) 2014-05-11 17:02:08 +08:00
Xinchen Hui
53b930475f Various bug fixed 2014-05-11 16:05:14 +08:00
Pierre Joye
486138ef3f Merge branch 'phpng' of git.php.net:php-src into phpng 
# By Xinchen Hui (27) and others
# Via Xinchen Hui (5) and others
* 'phpng' of git.php.net:php-src: (47 commits)
  Refactor MySQLi (incompleted, only compilable now)
  Add support for pspell
  update for phpng
  Test push (previous push didn't send mail?)
  Added smart_string to avoid string duplicated
  Use strpprintf
  Added vstrpprintf strpprintf to avoid duplicate string
  Refactor sysvsem, sysvshm, sysmsg
  Fix identical comparison of arrays with references
  Fix strtr() segfault
  Code cleanup in proc_open
  Finish ext/curl (7 tests fails as trunk)
  Fixed post data (long type cast matters here :<)
  Use zend_string for better performance
  Fixed clone refcount
  Fixed build with high version libcurl
  Refactoring ext/curl (only compilable now)
  Fix proc_open resource destruction
  Support for ext/phar (incomplete)
  Finish bz2 (all tests passed)
  ...
 2014-05-11 08:55:10 +02:00
Xinchen Hui
2402d6cbbc Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
Xinchen Hui
e9274de503 Add support for pspell 2014-05-11 00:58:48 +08:00
Felipe Pena
bd88e8dfd2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Move checking
 2014-05-10 11:55:51 -03:00
Felipe Pena
ece7421864 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Move checking
 2014-05-10 11:55:48 -03:00
Felipe Pena
16b293de50 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Move checking
 2014-05-10 11:55:45 -03:00
Felipe Pena
c575ab0c88 - Move checking 2014-05-10 11:55:42 -03:00
Felipe Pena
b09529ec1a Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
 2014-05-10 11:53:59 -03:00
Felipe Pena
c54b9f7b72 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
 2014-05-10 11:53:54 -03:00
Felipe Pena
8bea8cf9cd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
 2014-05-10 11:53:45 -03:00
Felipe Pena
345f6d90d5 - Fixed missing NULL check in SimpleXMLElement::xpath() 2014-05-10 11:53:40 -03:00
Felipe Pena
4308cf30ba Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed missing NULL check
 2014-05-10 11:40:04 -03:00
Felipe Pena
edbd6c7cc0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed missing NULL check
 2014-05-10 11:39:47 -03:00
Felipe Pena
2379ec474e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed missing NULL check
 2014-05-10 11:39:28 -03:00
Felipe Pena
5bd443a452 - Fixed missing NULL check 2014-05-10 11:39:08 -03:00
krakjoe
08c4b4736e update for phpng 2014-05-10 10:02:33 +01:00
Xinchen Hui
beb042090d Added smart_string to avoid string duplicated 
for now, if we want result a char * use smart_string, if zend_string
 use smart_str
 2014-05-10 11:09:17 +08:00
Anatol Belski
7ac7069e99 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
 2014-05-09 22:18:07 +02:00
Anatol Belski
c925c7a5b6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
 2014-05-09 22:16:42 +02:00
Anatol Belski
c62f32c3cc Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream 
upstream patch applied
 2014-05-09 22:15:54 +02:00
Xinchen Hui
b1c9d5ddee Use strpprintf 2014-05-10 00:43:02 +08:00
Xinchen Hui
e2890e3a0f Refactor sysvsem, sysvshm, sysmsg 2014-05-09 23:28:21 +08:00
Nikita Popov
f1e1231529 Fix strtr() segfault 2014-05-09 15:14:27 +02:00
Nikita Popov
1616415056 Code cleanup in proc_open 2014-05-09 13:01:38 +02:00
Xinchen Hui
1071bf74cf Finish ext/curl (7 tests fails as trunk) 2014-05-09 14:58:07 +08:00
Xinchen Hui
f4c105dc7d Fixed post data (long type cast matters here :<) 2014-05-09 14:48:39 +08:00
Xinchen Hui
763cee63ab Use zend_string for better performance 2014-05-09 14:14:09 +08:00
Xinchen Hui
2d9bc88db8 Fixed clone refcount 2014-05-09 14:00:47 +08:00
Xinchen Hui
564db38dc4 Fixed build with high version libcurl 2014-05-09 13:54:42 +08:00
Xinchen Hui
c5e63f8a63 Refactoring ext/curl (only compilable now) 2014-05-09 12:17:39 +08:00
Nikita Popov
b57d558d56 Fix proc_open resource destruction 2014-05-09 00:24:01 +02:00
Dmitry Stogov
2a31934a1a Support for ext/phar (incomplete) 2014-05-08 21:18:59 +04:00
Xinchen Hui
28bc91d8b4 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-08 23:02:53 +08:00
Xinchen Hui
afa1de1883 Finish bz2 (all tests passed) 2014-05-08 22:59:17 +08:00
Dmitry Stogov
df5ad846c6 Support for ext/phar (incomplete) 2014-05-08 18:30:07 +04:00
Xinchen Hui
979c665f21 There is memleak 2014-05-08 22:01:50 +08:00
krakjoe
ebaee948d9 bz2 changes for phpng 2014-05-08 13:14:19 +01:00
krakjoe
29a48fe73b update skeleton 2014-05-08 12:29:56 +01:00
krakjoe
8c7064b2f7 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-08 11:58:28 +01:00
krakjoe
f9cfbb8ea1 recode update for phpng 2014-05-08 11:57:35 +01:00
Xinchen Hui
7541f93f97 ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql 2014-05-08 18:34:56 +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
Stanislav Malyshev
281bde7701 Merge branch 'PHP-5.6' 
* PHP-5.6:
  oops, 5.4 and 5.5 use malloc in TSRM
 2014-05-08 02:04:50 -07:00
Stanislav Malyshev
a3f09eb323 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  oops, 5.4 and 5.5 use malloc in TSRM
 2014-05-08 02:04:11 -07:00
Stanislav Malyshev
cf2b9955d4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  oops, 5.4 and 5.5 use malloc in TSRM
 2014-05-08 02:00:23 -07:00
Stanislav Malyshev
4392339c3e oops, 5.4 and 5.5 use malloc in TSRM 2014-05-08 01:59:39 -07:00
Xinchen Hui
be79628b87 Fixed REFERENCE handling 2014-05-08 16:11:50 +08:00
Stanislav Malyshev
0c709cc2dc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix memory leak in TSRM
 2014-05-08 01:01:15 -07:00
Stanislav Malyshev
a444900c8d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix memory leak in TSRM
 2014-05-08 01:00:51 -07:00
Stanislav Malyshev
0cc18fdfba Fix memory leak in TSRM 2014-05-08 01:00:34 -07:00
Xinchen Hui
5f46c8fa31 Fixed bugs in pdo_mysql 2014-05-08 15:19:43 +08:00
Xinchen Hui
dfc940c5d9 Revert "Going to refactor mysqlnd" 
This reverts commit 37d9f1e6e9.
 2014-05-08 11:50:56 +08:00
Dmitry Stogov
fa7008bb24 Fixed resource destruction 2014-05-08 02:48:31 +04:00
Stanislav Malyshev
da4cd8edb0 Fix memory leak in TSRM 2014-05-07 13:28:03 -07: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
Dmitry Stogov
d41d6cf206 Interned strings must not be modified in-place 
MAKE_COPY_ZVAL() should be changed into ZVAL_DUP()
 2014-05-07 22:08:25 +04:00
Xinchen Hui
37d9f1e6e9 Going to refactor mysqlnd 2014-05-07 23:34:23 +08:00
Daniel Lowrey
b637946a23 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Allow crypto_method context value in stream_socket_enable_crypto()
 2014-05-07 08:13:31 -06:00
Daniel Lowrey
27f5957e9f Bug #67224: stream_socket_enable_crypto() 
- Allow crypto_method context value in stream_socket_enable_crypto()
- As of 5.6.x stream crypto type may be specified in the SSL context,
  making the $crypto_type parameter to stream_socket_enable_crypto()
  optional. This commit checks for a crypto type in the context prior
  to erroring out.
- Update NEWS/UPGRADING
 2014-05-07 08:05:29 -06:00
Dmitry Stogov
449ea00a48 Fixed ext/fileinfo conversion mistakes 2014-05-07 17:58:28 +04:00
Dmitry Stogov
e75f2d1f76 Fixed bug introduced during conversion to "phpng" 2014-05-07 16:15:29 +04:00
Dmitry Stogov
b54dcab377 Initialize "retval" 2014-05-07 15:36:01 +04:00
Dmitry Stogov
d5831bfa12 Merge branch 'phpng' of git.php.net:php-src into phpng 
* 'phpng' of git.php.net:php-src:
  fix exif, thnx laruence
 2014-05-07 15:14:41 +04:00
krakjoe
1f9ecf42b6 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-07 12:04:04 +01:00
Dmitry Stogov
0c6a6f0fba Re-applyed Bob's patch with minor fixes 2014-05-07 15:03:56 +04:00
krakjoe
6cab75aaa4 fix exif, thnx laruence 2014-05-07 12:03:00 +01:00
Pierre Joye
670feb3a53 typo in var name 2014-05-07 11:17:03 +02:00
Xinchen Hui
e3a0809655 Rerevert previous commit to phpt by accident 2014-05-07 17:01:59 +08:00
Xinchen Hui
ea26b820e1 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-07 16:53:20 +08:00
Xinchen Hui
ed5b6af8af Refactored filter 2014-05-07 16:52:58 +08:00
krakjoe
0a134d1a3a phpng updates for exif 2014-05-07 07:59:45 +01:00
Xinchen Hui
9ef21b7606 Refactor fileinfo 2014-05-07 13:50:29 +08:00
Xinchen Hui
478a8b2ebb Fixed reference handling(param->parameter) 2014-05-07 12:01:07 +08: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
4ecc527976 Reverted Bob's patch (it breaks many tests when run with opcache and needs to be fixed first). 2014-05-07 03:26:13 +04:00
Ferenc Kovacs
f63ca453e0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test (it requires ext/hash)
 2014-05-07 01:00:01 +02:00
Ferenc Kovacs
8e2d396b52 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test (it requires ext/hash)
 2014-05-07 00:55:05 +02:00
Dmitry Stogov
8517001b25 Fixed test (it requires ext/hash) 2014-05-07 00:52:49 +02:00
Ferenc Kovacs
0cd679fb17 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
 2014-05-07 00:39:57 +02:00
Ferenc Kovacs
d2f283884f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
 2014-05-07 00:38:57 +02:00
Ferenc Kovacs
579898e338 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
 2014-05-07 00:38:32 +02:00
Dmitry Stogov
f880013c4d Fixed tests (they might fail from time to time because of session GC) 2014-05-07 00:37:56 +02:00
Dmitry Stogov
424aebbf36 Added support for ext/openssl 2014-05-07 01:09:42 +04:00
Martin Jansen
71ad601dee Fix typo 2014-05-06 22:08:52 +02:00
Nikita Popov
a9ba7a6779 Add tests for previous commit 2014-05-06 22:04:58 +02:00
Martin Jansen
c0f4e270a8 This test requires the hash extension. 2014-05-06 21:34:10 +02:00
Nikita Popov
4c5b5d7201 Port ext/gmp (one failure) 2014-05-06 19:03:48 +02:00
Bob Weinand
f3c1881f1d Re-added fix for bug #66015 and adapted for phpng branch 2014-05-06 14:59:03 +02:00
Dmitry Stogov
485a60414d Fixed incorrect boolean IS_FALSE/IS_TRUE handling 2014-05-06 15:59:49 +04:00
Dmitry Stogov
ebe024fd78 Fixed memory leaks 2014-05-06 15:18:17 +04:00
Dmitry Stogov
70a5e0e429 Fixed support for references and proper string lengths 2014-05-06 15:03:25 +04:00
Dmitry Stogov
6f5a0df570 added support for ext/posix 2014-05-06 14:50:54 +04:00
Dmitry Stogov
53b5de1e64 Added support for ext/pcntl (incomplete; ext/posix required to run all tests) 2014-05-06 14:23:56 +04:00
krakjoe
b2fe1c1648 ... 2014-05-06 11:22:15 +01:00
Michael Wallner
333638b0d3 remove useless indirection 
the stream was initialized within the ops
in a prior version of the slim_post_data patch
 2014-05-06 12:22:08 +02:00
Michael Wallner
5bdfa4d1c6 remove useless indirection 
the stream was initialized within the ops
in a prior version of the slim_post_data patch
 2014-05-06 12:21:43 +02:00
krakjoe
ff9597a238 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-06 11:21:21 +01:00
krakjoe
7f32ffbf89 fix leaks in here 2014-05-06 11:20:54 +01:00
Andrey Hristov
4df71647b6 Merge branch 'PHP-5.6' 2014-05-06 12:17:29 +03:00
Dmitry Stogov
0ea615fd10 Mark all strings stored in SHM as IS_INTERNED to avoid refcounting 2014-05-06 12:41:27 +04:00
Andrey Hristov
1a293e6bd9 rename a constant - old name to new name 2014-05-06 11:36:03 +03:00
krakjoe
4187be99fe fix for phpng, failing RFC2144 test 2014-05-06 09:08:02 +01:00
krakjoe
362e1db428 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-06 08:01:26 +01:00
krakjoe
360962ea29 fix ftp for ng 2014-05-06 07:54:54 +01: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
Nikita Popov
b9438a1ec7 Fix use after free for doc_comment persist 2014-05-05 19:56:05 +02:00
Nikita Popov
592aa37f67 Fix memory error in ext/xml 2014-05-05 17:43:13 +02:00
Nikita Popov
4d22be992c Fix ZTS 2014-05-05 17:28:22 +02:00
Xinchen Hui
a636c4c03f Fixed segfault in _xml_xmlchar_zval 2014-05-05 19:52:42 +08:00
Xinchen Hui
fa6f6c8807 Fixed Reference handling in xml_parse_into_struct 2014-05-05 19:45:50 +08:00
Xinchen Hui
c73c6526ef clean up 2014-05-05 18:09:15 +08:00
Xinchen Hui
39c521c056 Finish Zip (all tests pass) 2014-05-05 17:48:49 +08:00
Xinchen Hui
356824df4c Romove unnecessary proxy macro 2014-05-05 17:44:07 +08: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
Xinchen Hui
72f46a34b8 Refactor zlib (all tests pass) 2014-05-05 15:52:09 +08:00
Xinchen Hui
f7ee17d9f7 Refactor gettext 2014-05-05 14:32:32 +08:00
Xinchen Hui
fee9d4cafd Refactor bcmath 2014-05-05 14:26:23 +08:00
Xinchen Hui
7e3989f301 Fixed memory leak in prop_handlers registering 2014-05-05 14:04:52 +08:00
Xinchen Hui
cd00ea9993 Port iconv (all tests passes) 2014-05-05 13:58:23 +08:00
Xinchen Hui
ea33fbd833 Don't use this (keyword) 2014-05-05 10:56:18 +08:00
Xinchen Hui
bea30846bb Refactor Zip (1 test failed) 2014-05-05 10:49:27 +08:00
Xinchen Hui
cf15e94e07 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-05-05 10:34:04 +08:00
Nikita Popov
b30c7fe263 Port JSON 2014-05-05 01:00:59 +02: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
Anatol Belski
53b4d2feea Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated libmagic.patch
 2014-05-04 21:34:36 +02:00
Anatol Belski
06ae920165 updated libmagic.patch 2014-05-04 21:34:17 +02:00
Anatol Belski
fe7853137b Merge branch 'PHP-5.6' 
* PHP-5.6:
  added missing stdint header, bug #66907
 2014-05-04 21:27:37 +02:00
Anatol Belski
031cafd4e2 added missing stdint header, bug #66907 2014-05-04 21:26:53 +02:00
Xinchen Hui
41f6889436 Fixed SimpleXMl build with DOM 2014-05-04 11:46:17 +08:00
Xinchen Hui
f3ccbb3c40 Use self instead of this(keyword) 2014-05-04 11:35:05 +08:00
Xinchen Hui
a275f4c64d Port XMLWriter 2014-05-04 11:33:17 +08:00