1
0
mirror of https://github.com/php/php-src.git synced 2026-04-19 22:11:12 +02:00
Commit Graph

82656 Commits

Author SHA1 Message Date
Dmitry Stogov
2ece977c80 Fixed conversion of empty packed array into hash 2014-08-14 13:44:37 +04:00
Dmitry Stogov
25bda5ae3c Fixed assignment of reference to itself 2014-08-14 12:01:28 +04:00
Dmitry Stogov
753813e542 Restored "???" mark in the place that might be changed later 2014-08-14 10:46:17 +04:00
Xinchen Hui
f7f411e4e2 It's okey for use a stack value here (deleted immediately after use) 2014-08-14 12:26:45 +08:00
Xinchen Hui
c749fe2067 cleanup 2014-08-14 12:15:24 +08:00
Xinchen Hui
bfc1ae07be Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 2014-08-14 11:52:46 +08:00
Dmitry Stogov
73fe418637 Avoid reallocation 2014-08-13 23:30:07 +04:00
Dmitry Stogov
8296129e50 cleanuo (use zend_string instead of char*) 2014-08-13 22:26:07 +04:00
Dmitry Stogov
bb7d9005b5 cleanup 2014-08-13 22:21:51 +04:00
Dmitry Stogov
01c8aee7d2 cleanup 2014-08-13 22:18:05 +04:00
Dmitry Stogov
a08b7b7701 cleanup 2014-08-13 19:43:34 +04:00
Dmitry Stogov
c1c913c5f1 cleanup (we don't have to duplicate elements of module_registry) 2014-08-13 17:05:18 +04:00
Dmitry Stogov
b59cc8de23 cleanup (we don't have to duplicate elements of stream_filters_hash) 2014-08-13 17:00:13 +04:00
Dmitry Stogov
9fea4348fd cleanup 2014-08-13 16:55:21 +04:00
Dmitry Stogov
5a06ac88da cleanup (use zend_string* instead of char*) 2014-08-13 14:51:48 +04:00
Xinchen Hui
35dd200430 clean up - remove checked questions 2014-08-13 16:44:22 +08:00
Dmitry Stogov
b8517e410c cleanup 2014-08-13 12:36:10 +04:00
Xinchen Hui
da3aeeed39 clean up - avoid realloc 2014-08-13 15:51:43 +08:00
Dmitry Stogov
05eaed4345 Merge branch 'master' into phpng
* master:
  fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
  Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
2014-08-12 14:46:38 +04:00
Ferenc Kovacs
b3468662de Merge branch 'PHP-5.6'
* PHP-5.6:
  fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
2014-08-12 10:44:09 +02:00
Ferenc Kovacs
54e8595f34 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
2014-08-12 10:38:35 +02:00
Ferenc Kovacs
7aa776c7b4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
2014-08-12 10:37:44 +02:00
Ferenc Kovacs
39dd715382 fix the failing date tests introduced with the latest timezonedb update
Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
2014-08-12 10:34:54 +02:00
Dmitry Stogov
06476e5291 Fixed ext/odbc 2014-08-12 11:27:30 +04:00
Dmitry Stogov
8210b3b8c4 ext/pdo_odbc support for phpng (tested with unixODBC and mysql driver) 2014-08-12 11:00:06 +04:00
Dmitry Stogov
c4fc99ff82 ext/odbc support for phpng (incomplete) 2014-08-12 02:10:30 +04:00
Dmitry Stogov
7435fc88a6 Fixed pdo_firebird tests failures 2014-08-11 23:56:34 +04:00
Dmitry Stogov
3ae802508a Fixed mode 2014-08-11 18:38:36 +04:00
Dmitry Stogov
8013a27ad9 Implemented ext/com_dotnet support for phpng 2014-08-11 18:37:26 +04:00
Xinchen Hui
dc06b4f941 Merge branch 'PHP-5.6' 2014-08-11 17:47:47 +08:00
Xinchen Hui
1f496744ed Merge branch 'PHP-5.5' into PHP-5.6 2014-08-11 17:47:36 +08:00
Xinchen Hui
b6ddcf9c71 Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message) 2014-08-11 17:46:56 +08:00
Xinchen Hui
d4df6d0200 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2014-08-11 17:44:42 +08:00
Dmitry Stogov
4c716e8b51 Merge branch 'master' into test
* master: (39 commits)
  Add __debugInfo() to UPGRADING.
  fix TS build
  Update NEWS
  Update NEWS
  Update NEWS
  Small tidy ups and raise visibility of GitHub PR process
  Bug #41631: Observe socket read timeouts in SSL streams
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
  - Updated to version 2014.6 (2014f)
  Removed Countable::count() change info from UPGRADE.INTERNALS too
  NEWS and UPGRADING for intdiv()
  Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
  Fixed skip case for intdiv 64-bit test
  Use callback structure
  Add EXPECTF
  Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
  5.5.17 now
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  ...

Conflicts:
	ext/fileinfo/libmagic/softmagic.c
	main/streams/xp_socket.c
2014-08-11 11:38:41 +04:00
Dmitry Stogov
0ae305e62d Fixed compilation warnings about unused labels 2014-08-11 10:17:06 +04:00
krakjoe
1d01e2334c fix incorrect cast of comparison function and signature of function 2014-08-11 06:47:09 +01:00
krakjoe
dc70139d85 update zend_make_printable_zval to take TSRM context 2014-08-11 06:09:46 +01:00
krakjoe
4513475a41 fix ZTS build 2014-08-10 09:31:02 +01:00
Adam Harvey
97bb078bdd Merge branch 'PHP-5.6'
* PHP-5.6:
  Add __debugInfo() to UPGRADING.
2014-08-08 12:02:56 -07:00
Adam Harvey
cd63740db7 Add __debugInfo() to UPGRADING.
RMs: this is an UPGRADING only change, and should be safe for RCs.

Developers: please remember to update UPGRADING, otherwise there's a good
chance your shiny new feature won't be documented! (As has happened here.)
2014-08-08 12:00:13 -07:00
Dmitry Stogov
4a3e501fb3 cleanup 2014-08-08 13:47:34 +04:00
Anatol Belski
6936c7a1bb Merge branch 'PHP-5.6'
* PHP-5.6:
  fix TS build
2014-08-07 19:51:04 +02:00
Anatol Belski
8b8297170e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix TS build
2014-08-07 19:50:45 +02:00
Anatol Belski
75991561d6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix TS build
2014-08-07 19:50:25 +02:00
Anatol Belski
84a4041ba4 fix TS build 2014-08-07 19:49:59 +02:00
Daniel Lowrey
5542e60c79 Merge branch 'PHP-5.6' 2014-08-07 12:45:50 -04:00
Daniel Lowrey
6e8de9b418 Update NEWS 2014-08-07 12:40:52 -04:00
Daniel Lowrey
dc53eba23b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update NEWS
  Update NEWS
2014-08-07 12:39:52 -04:00
Daniel Lowrey
a04c5536bb Update NEWS 2014-08-07 12:39:42 -04:00
Daniel Lowrey
378ffd3cdf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Update NEWS
2014-08-07 12:38:04 -04:00