mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-25 01:40:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
71,637 Commits 503 Branches 1,387 Tags 848 MiB
63d9c1f40b
Commit Graph

71637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Pierre Joye
2b7bddd82a Merge branch 'PHP-5.4' 
* PHP-5.4:
  - fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
 2012-09-05 13:00:41 +02:00
Pierre Joye
954e7a3b3c - fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master 2012-09-05 13:00:04 +02:00
Pierre Joye
4a7d1b4ed8 - fix build, declarations must be 1st in a contextgit checkout -f master 2012-09-05 12:53:29 +02:00
Dmitry Stogov
bceec038c8 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62907 (Double free when use traits)

Conflicts:
	NEWS
 2012-09-05 10:01:04 +04:00
Dmitry Stogov
6c0508f8d5 Fixed bug #62907 (Double free when use traits) 2012-09-05 09:58:22 +04:00
Dmitry Stogov
061f3799eb Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  forked two tests for windows
 2012-09-05 09:55:14 +04:00
Dmitry Stogov
72473962a9 Fixed bug #62991 (Segfault with generator and closure) 2012-09-05 09:50:55 +04:00
Anatoliy Belsky
4b206126ac Merge branch 'PHP-5.4' 
* PHP-5.4:
  forked two tests for windows
 2012-09-03 13:48:02 +02:00
Anatoliy Belsky
ff0aa24054 forked two tests for windows 
* bug55544.phpt - VT vs. EXT at the start of the data block,
but the data can still be decoded correctly
* bug_52944.phpt works with the corrupted data and has some
different out

Most likely the ASM optimization under windows is responsible
for this behaviour.
 2012-09-03 13:37:34 +02:00
Dmitry Stogov
2a57a25636 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
 2012-09-03 12:00:19 +04:00
Dmitry Stogov
2659f5e88e Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:52:42 +04:00
Dmitry Stogov
33db8c0ef6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
 2012-09-03 11:51:17 +04:00
Dmitry Stogov
0ab27c35a4 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice). 2012-09-03 11:51:08 +04:00
Dmitry Stogov
485c09a376 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice). 2012-09-03 11:49:58 +04:00
Dmitry Stogov
38476a1543 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
 2012-09-03 11:47:59 +04:00
Dmitry Stogov
7e816c0921 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:46:47 +04:00
Dmitry Stogov
4cca6241e0 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:38:08 +04:00
Lars Strojny
6fc2962b9a Merge branch 'PHP-5.4' 2012-09-02 22:11:47 +02:00
Lars Strojny
a26390ef0c Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false 2012-09-02 22:10:23 +02:00
Nikita Popov
cdb9fe99c2 Merge remote-tracking branch 'reeze/add-reflection-isGenerator' 2012-09-02 17:40:23 +02:00
Reeze Xia
ad0da9ae60 Implemented ReflectionFunction::isGenerator() 2012-09-02 23:29:56 +08:00
Lars Strojny
352a1956b6 Allow null as a default value for length in mb_substr() and mb_strcut() 2012-09-02 15:02:26 +02:00
Lars Strojny
d371a306a2 Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4 2012-09-02 14:53:52 +02:00
Lars Strojny
133f610bb1 Allow null as a default value for length in mb_substr() and mb_strcut() 2012-09-02 14:52:05 +02:00
Xinchen Hui
32a97dfae6 Merge branch 'PHP-5.4' 2012-09-02 16:53:31 +08:00
Xinchen Hui
069c448623 folder 2012-09-02 16:52:53 +08:00
Lars Strojny
89948c7fbe Initializing optional argument description in assert() 2012-09-02 08:01:32 +02:00
Lars Strojny
e212de4a44 Initializing optional argument description in assert() 2012-09-02 08:01:18 +02:00
Xinchen Hui
4e84f72554 Fix test failed due to new Token T_YIELD 2012-09-02 13:15:23 +08:00
Stanislav Malyshev
664e763c2c Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix NEWS
 2012-09-01 17:00:01 -07:00
Stanislav Malyshev
f7d51df5c6 fix NEWS 2012-09-01 16:57:29 -07:00
Nikita Popov
dffffdeb3d Fix leak when yielding array as key 
The code was copy-pasted and I forgot to change OP1 to OP2 in that one
place.
 2012-09-01 20:31:40 +02:00
Nikita Popov
1b5b839312 Drop obsolete test 2012-09-01 20:10:12 +02:00
Gustavo Lopes
53351d087d Merge branch 'generators' 
* generators: (70 commits)
  Fix typos
  Fix segfault when traversing a by-ref generator twice
  Make sure that exception is thrown on rewind() after closing too
  Remove implementation stubs for yield delegation
  Fix several issues and allow rewind only at/before first yield
  Run finally if generator is closed before finishing
  Finally with return now works in generators too
  Add dedicated opcode for returns from a generator
  Disallow serialization and unserialization
  Fix zts build (typo)
  Drop Generator::close() method
  Forgot to add test
  Support trivial finally in generators (no yield, no return)
  Fix implementation of Iterator interface
  Add T_YIELD in tokenizer_data.c
  Throw error also for return occuring before yield
  Fix throwing of exceptions within a generator
  Remove reference restrictions from foreach
  Require parenthesis around yield expressions
  Add some more tests
  ...
 2012-09-01 19:07:20 +02:00
Xinchen Hui
7b5960b085 Merge branch 'PHP-5.4' 2012-09-01 14:38:33 +08:00
Xinchen Hui
f3108b5f81 Remove extra blank in notice message, should act as same as vm 2012-09-01 14:37:45 +08:00
Xinchen Hui
59e34bad32 Merge branch 'PHP-5.4' 2012-09-01 14:27:59 +08:00
Xinchen Hui
863e7e0acb Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/spl/spl_array.c
 2012-09-01 14:27:09 +08:00
Xinchen Hui
67d7d03f00 Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables) 
The get_zval_ptr_ptr of spl_array handler should act as same as the vm's
 2012-09-01 14:21:34 +08:00
Lars Strojny
e658a91b3d assert() user message 
Added 2nd, optional, param to assert. When passed in it will be added
to the printed warnings and passed as a 4th param to a callback. PR 150
by Lonny Kapelushnik
 2012-08-31 19:04:53 +02:00
Lars Strojny
64c168efc5 Tests for the previous assert() with user message 2012-08-31 19:01:57 +02:00
Lars Strojny
167108d73c assert() user message 
Added 2nd, optional, param to assert. When passed in it will be added
to the printed warnings and passed as a 4th param to a callback. PR 150
by Lonny Kapelushnik
 2012-08-31 18:55:43 +02:00
Xinchen Hui
b5d2c3174f Merge branch 'PHP-5.4' 2012-08-31 11:25:21 +08:00
Xinchen Hui
66fad45724 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-31 11:24:10 +08:00
Xinchen Hui
5dc2cef370 Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes) 2012-08-31 11:22:43 +08:00
Felipe Pena
8afb848e18 - BFN 2012-08-30 09:33:35 -03:00
Felipe Pena
5e51209785 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
 2012-08-30 09:32:34 -03:00