clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,658 Commits 494 Branches 1,367 Tags 803 MiB
e8b7f5b35d
Commit Graph

71658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
7cdf6367a5 Finally with return now works in generators too 2012-08-24 13:52:16 +02:00
Nikita Popov
68c1e1cfe9 Add dedicated opcode for returns from a generator 
Generators don't have a return value, so it doesn't make sense to have
a shared implementation here.
 2012-08-24 13:51:39 +02:00
Nikita Popov
6517ed0215 Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2012-08-24 13:29:40 +02:00
Xinchen Hui
071580ea1f Merge branch 'PHP-5.4' 2012-08-24 18:24:55 +08:00
Xinchen Hui
2c74536e6e Merge branch 'PHP-5.3' into PHP-5.4 2012-08-24 18:22:11 +08:00
Xinchen Hui
55d680e968 better fix 2012-08-24 18:21:49 +08:00
Xinchen Hui
1701460867 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/phar/tests/phpinfo_003.phpt
 2012-08-24 18:20:35 +08:00
Xinchen Hui
7bedd275eb Fix test 2012-08-24 18:18:38 +08:00
Xinchen Hui
a3d701e11c Merge branch 'PHP-5.4' 2012-08-23 23:28:24 +08:00
Xinchen Hui
21f085720c Merge branch 'PHP-5.3' into PHP-5.4 2012-08-23 23:28:02 +08:00
Xinchen Hui
13bcf685cb Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) 2012-08-23 23:27:16 +08:00
Xinchen Hui
42f91d6ac6 Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) 2012-08-23 23:21:25 +08:00
Anatoliy Belsky
8b0a87f1c3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fixing test for upcoming mpir upgrade
 2012-08-23 17:12:49 +02:00
Anatoliy Belsky
9a72b52a1f fixing test for upcoming mpir upgrade 
- mpir is going to be upgraded up to 2.5.1 on windows
 2012-08-23 17:09:45 +02:00
Anatoliy Belsky
6df1b2c5aa Merge branch 'PHP-5.4' 
* PHP-5.4:
  ZTS fix introduced by Felipe must also go into 5.3
  Updated INSTALL. Generated from the XML Docs.
  Update NEWS given a5d0c1e2
 2012-08-23 13:36:20 +02:00
Anatoliy Belsky
e4a3696553 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  ZTS fix introduced by Felipe must also go into 5.3
  Updated INSTALL. Generated from the XML Docs.
  Update NEWS given a5d0c1e2

Conflicts:
	NEWS
 2012-08-23 13:35:30 +02:00
Anatoliy Belsky
eca4fc6991 ZTS fix introduced by Felipe must also go into 5.3 2012-08-23 13:32:06 +02:00
Gustavo André dos Santos Lopes
d9f5b1e9bc Merge branch '5.4' 
* 5.4:
  Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition
 2012-08-23 10:33:13 +01:00
Gustavo André dos Santos Lopes
d212a5d391 Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition 2012-08-23 10:32:05 +01:00
Xinchen Hui
3ef3b80cdd Merge branch 'PHP-5.4' 2012-08-23 16:13:57 +08:00
Xinchen Hui
87785c7d5a tabs 2012-08-23 16:13:34 +08:00
Xinchen Hui
9b2ca07223 Merge branch 'PHP-5.4' 2012-08-23 16:07:13 +08:00
Xinchen Hui
d39aa984ad Refix #62358, previous has side-affect 2012-08-23 16:06:17 +08:00
Xinchen Hui
b8800d1701 Merge branch 'PHP-5.4' 2012-08-23 15:45:06 +08:00
Xinchen Hui
6d1bebfcb0 Fixed bug #62358 (Segfault when using traits a lot) 2012-08-23 15:41:49 +08:00
Philip Olson
64bd4551b4 Updated INSTALL. Generated from the XML Docs. 2012-08-22 23:40:48 -07:00
Philip Olson
6a8db0c081 Updated INSTALL. Generated from the XML Docs. 2012-08-22 23:33:29 -07:00
Felipe Pena
058e2947fa Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed ZTS build
 2012-08-22 19:40:05 -03:00
Felipe Pena
b98fc4379f - Fixed ZTS build 2012-08-22 19:39:57 -03:00
Gustavo Lopes
ca4dd76160 Update NEWS given a5d0c1e2 2012-08-22 23:04:46 +02:00
Gustavo Lopes
b9eae3d67c Fix handling of several uinitialized intl objects 
Master specific changes. Not having this in the merge commit helps
porting to pecl/intl
 2012-08-22 22:54:43 +02:00
Gustavo Lopes
fcd4420dbf Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix handling of several uinitialized intl objects
  Fix handling of several uinitialized intl objects
  - Fix NEWS
  - BFN

Conflicts:
	ext/intl/dateformat/dateformat.c
 2012-08-22 22:53:07 +02:00
Gustavo Lopes
cd1f45b3be Fix handling of several uinitialized intl objects 
PHP 5.4 specific changes. Not having this in the merge commit helps
porting to pecl/intl
 2012-08-22 22:38:31 +02:00
Gustavo Lopes
87803ace94 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix handling of several uinitialized intl objects
 2012-08-22 22:37:52 +02:00
Gustavo Lopes
a5d0c1e21b Fix handling of several uinitialized intl objects 2012-08-22 22:32:51 +02:00
andrey
815874c646 plug a leak when the server ask the client for a auth protocol, that 
the client doesn't understand. This is 5.5 specific bug, as a result
of a refactoring in 5.5
 2012-08-22 20:04:42 +02:00
Felipe Pena
fbacf9c237 - Fix NEWS 2012-08-22 11:19:42 -03:00
Sebastian Bergmann
a90170e6f8 WTF? 2012-08-22 16:14:14 +02:00
Felipe Pena
b721ed57eb - BFN 2012-08-22 10:54:14 -03:00
Felipe Pena
596e855feb Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
 2012-08-22 10:51:06 -03:00
Felipe Pena
7a56ac00a0 - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private) 2012-08-22 10:50:50 -03:00
Xinchen Hui
3938e5d616 Merge branch 'finally' 2012-08-22 18:33:37 +08:00
Xinchen Hui
60a29791e4 Fixed bug that jmp in try block jmp over finally block 
Refactor the implemention,  make codes clear
 2012-08-22 18:32:03 +08:00
Xinchen Hui
3d4f91da4b Merge branch 'master' into finally 2012-08-22 18:12:11 +08:00
Anatoliy Belsky
dac25a0d50 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62313 Zend\tests\errmsg_021.phpt fails
 2012-08-22 11:45:32 +02:00
Anatoliy Belsky
22f55d5665 Fixed bug #62313 Zend\tests\errmsg_021.phpt fails 2012-08-22 11:43:12 +02:00
Xinchen Hui
2af7a76822 Merge branch 'PHP-5.4' 2012-08-22 13:52:04 +08:00
Xinchen Hui
703a4e390d stash 2012-08-22 13:51:44 +08:00
Xinchen Hui
4e561055a4 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-22 13:49:04 +08:00
Xinchen Hui
e5bdd2c0ee Fixed bug #62885 (mysqli_poll - Segmentation fault) 2012-08-22 13:41:47 +08:00