clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 12:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,063 Commits 494 Branches 1,367 Tags 781 MiB
bc99c0debb
Commit Graph

81063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Xinchen Hui
7de633c549 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-08 17:03:26 +08: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
Stanislav Malyshev
607b0f99bf Merge branch 'PHP-5.6' 
* PHP-5.6:
  make release tags not fail Travis CI
 2014-05-08 01:12:06 -07:00
Xinchen Hui
be79628b87 Fixed REFERENCE handling 2014-05-08 16:11:50 +08:00
Stanislav Malyshev
aa1a25e303 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  make release tags not fail Travis CI
 2014-05-08 01:11:44 -07:00
Stanislav Malyshev
e9be93b333 make release tags not fail Travis CI 2014-05-08 01:11:29 -07:00
Stanislav Malyshev
cfe9596260 make release tags not fail Travis CI 2014-05-08 01:08:55 -07:00
Stanislav Malyshev
f90505f5c4 don't bother with travis for now, not ready yet 2014-05-08 01:05:17 -07:00
Stanislav Malyshev
79bdc75cb3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix memory leak in TSRM
 2014-05-08 01:01:34 -07: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
c242518bf0 There should been memory leaks(and don't use pointer cast) 2014-05-08 15:20:13 +08: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
2393000aeb Prefer the macro we defined 2014-05-07 17:06:27 +08: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
8b90b17c8d Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-07 13:50:53 +08:00
Xinchen Hui
9ef21b7606 Refactor fileinfo 2014-05-07 13:50:29 +08:00
Pierre Joye
38c886a449 -- missing length declaration, may have worked w/some gcc as length is not used in the macro but still need it, ifdef just make code uncertain. will get opt out anyway if not used 2014-05-07 07:31:21 +02: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