clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,061 Commits 491 Branches 1,363 Tags 839 MiB
b1dbfb7357
Commit Graph

73061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
b1dbfb7357 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
 2013-03-15 19:12:34 +01:00
Anatol Belski
73c38eca5a updated NEWS 2013-03-15 19:11:53 +01:00
Anatol Belski
f058942923 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Backported patch for #64370
 2013-03-15 19:09:18 +01:00
Anatol Belski
90c8f16c3b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Backported patch for #64370
 2013-03-15 19:08:32 +01:00
Anatol Belski
b903d2d6cd Backported patch for #64370 2013-03-15 19:04:40 +01:00
Anatol Belski
0ee71557ff Fixed bug #53437 Crash with unserialized DatePeriod instance 2013-03-15 16:59:54 +01:00
Nikita Popov
b7788c52f1 Fix wrong macro usage and add missing NEWS entry 2013-03-15 13:48:33 +01:00
Ferenc Kovacs
cc51729c00 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  explain the step updating the git submodule reference in web/php.git
 2013-03-15 09:41:50 +01:00
Ferenc Kovacs
30eff1a697 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  explain the step updating the git submodule reference in web/php.git
 2013-03-15 09:41:34 +01:00
Ferenc Kovacs
9350f45aca explain the step updating the git submodule reference in web/php.git 2013-03-15 09:40:28 +01:00
Anatol Belski
96388c78c9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix zts check
 2013-03-14 14:39:47 +01:00
Anatol Belski
5df8cf1975 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix zts check
 2013-03-14 14:39:09 +01:00
Anatol Belski
e43c5a8395 fix zts check 2013-03-14 14:38:20 +01:00
Dmitry Stogov
dd1c358d1b Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  fix the fix
  fix for bug  #63530 	mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
  Forgot to remove some now unused variables
  Add support for non-scalar Iterator keys in foreach
  fixed headers order
  - Updated to version 2013.2 (2013b)
  fixed the test
  Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
  Disable zend_always_inline in debug build
 2013-03-14 14:19:41 +04:00
Andrey Hristov
c09652c289 fix the fix 2013-03-13 15:56:44 +01:00
Andrey Hristov
7503a4b4a4 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-03-13 15:29:40 +01:00
Dmitry Stogov
d77c865aff Removed redundand code 2013-03-13 17:51:10 +04:00
Andrey Hristov
0777a18703 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2013-03-13 14:24:23 +01:00
Andrey Hristov
f1e2edff8b fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind 2013-03-13 13:37:51 +01:00
Nikita Popov
28634bf603 Forgot to remove some now unused variables 2013-03-12 17:39:20 +01:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach 
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
 2013-03-12 17:27:31 +01:00
Anatol Belski
8436342d88 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed headers order
 2013-03-12 08:34:48 +01:00
Anatol Belski
a328cc452e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fixed headers order
 2013-03-12 08:34:16 +01:00
Anatol Belski
bdaafe3c7b fixed headers order 2013-03-12 08:33:36 +01:00
Derick Rethans
e5c64c0bda Merge branch 'PHP-5.4' into PHP-5.5 2013-03-11 21:36:41 +00:00
Derick Rethans
98bb5f4798 Merge branch 'PHP-5.3' into PHP-5.4 2013-03-11 21:36:37 +00:00
Derick Rethans
50ad2af503 - Updated to version 2013.2 (2013b) 2013-03-11 21:36:36 +00:00
Anatol Belski
278c4097c6 fixed the test 2013-03-11 16:14:39 +01:00
Anatol Belski
8aaa09636a Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']) 2013-03-11 16:04:37 +01:00
Xinchen Hui
4573405c5d Merge branch 'PHP-5.4' into PHP-5.5 2013-03-11 15:16:47 +08:00
Xinchen Hui
0444708c5c Disable zend_always_inline in debug build 
it will be much more easier for debuging
 2013-03-11 15:15:22 +08:00
Keyur Govande
c7ad92fac7 Adding in NEWS/UPGRADING about process title change support. 2013-03-11 00:20:57 +00:00
Keyur Govande
cdacda720c Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/push/php-src:
  Fix tests after laruence unserialize change
  Fix get_property_ptr_ptr declaration in simplexml
  Update NEWS
  Fixed confused exception message while user threw exception
  Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
  Fix date
  use NEWS only
  Fixed bug #61025 (__invoke() visibility not honored)
 2013-03-11 00:05:49 +00:00
Nikita Popov
9490118fdb Fix tests after laruence unserialize change 2013-03-09 20:21:33 +01:00
Nikita Popov
a59b211b2d Fix get_property_ptr_ptr declaration in simplexml 
A new parameter was added to the API and simplexml wasn't adjusted,
thus causing crashes.
 2013-03-09 20:15:00 +01:00
Xinchen Hui
9d816ba1d3 Update NEWS 2013-03-09 23:11:48 +08:00
Xinchen Hui
1be745ce1b Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/standard/var_unserializer.c
 2013-03-09 23:10:48 +08:00
Xinchen Hui
7197f0ffcc Fixed confused exception message while user threw exception 2013-03-09 23:08:14 +08:00
Xinchen Hui
f52b2e6a65 Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail) 
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
 2013-03-09 23:00:58 +08:00
Xinchen Hui
af5ada3871 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-09 11:38:32 +08:00
Xinchen Hui
6fece94369 Fix date 2013-03-09 11:37:41 +08:00
David Soria Parra
6824dc6b33 use NEWS only 2013-03-08 11:12:35 +01:00
Xinchen Hui
01049ca7ae Fixed bug #61025 (__invoke() visibility not honored) 2013-03-08 10:34:17 +08:00
Keyur Govande
5543035a70 Merge branch 'pull-request/300' into PHP-5.5 
* pull-request/300:
  Support for CLI process title (https://wiki.php.net/rfc/cli_process_title)
 2013-03-07 23:51:37 +00:00
Ralph Schindler
ac73ca6db4 Fix for https://bugs.php.net/bug.php?id=62649 2013-03-07 23:20:11 +01:00
Carson McDonald
0c11cab919 Typo fix: recieved to received 2013-03-07 23:05:05 +01:00
Keyur Govande
a0a995cff3 Support for CLI process title (https://wiki.php.net/rfc/cli_process_title) 
A new commit into branch 5.5
 2013-03-07 18:54:34 +00:00
David Soria Parra
e98271f588 News for next beta 2013-03-07 12:14:48 +01:00
David Soria Parra
d0ca2430da Do another Alpha instead of Beta because of ZO+ RFC being voted on 2013-03-07 12:14:26 +01:00
David Soria Parra
4923bb579a NEWS for the next beta 2013-03-06 23:51:27 +01:00