php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 05:51:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,978 Commits 547 Branches 1,483 Tags
f4e16fe7ef68bb22201a217dd92e4e2c1ef309fe
Commit Graph

7516 Commits

Author SHA1 Message Date
Nikita Popov
2f4c3ff330 Merge branch 'PHP-5.5' 2013-03-29 11:43:19 +01:00
Nikita Popov
8345abcabb Remove support for cloning generators 2013-03-29 11:42:10 +01:00
Dmitry Stogov
606c9bb658 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Removed deprecated check
 2013-03-29 03:18:51 +04:00
Dmitry Stogov
aa791a4d72 Removed deprecated check 2013-03-29 03:18:04 +04:00
Lars Strojny
218bcee202 Merge branch 'PHP-5.5' 
Conflicts:
	Zend/zend_ini_scanner.c
 2013-03-27 21:37:42 +01:00
Lars Strojny
25b3c94944 Added XOR support for expressions in INI parser: NEWS and zend_language_scanner.c 2013-03-27 21:30:56 +01:00
Dejan Marjanovic
05016b7e96 Added XOR support for expressions in INI parser 2013-03-27 21:28:53 +01:00
Dmitry Stogov
9a80cec0ce Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
	Zend/zend_language_scanner.c
 2013-03-28 00:10:13 +04:00
Dmitry Stogov
6e8aa09696 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
	NEWS
	Zend/zend_execute_API.c
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2013-03-28 00:08:11 +04:00
Dmitry Stogov
85e5e60777 Fixed bug #64529 (Ran out of opcode space) 2013-03-28 00:03:40 +04:00
Xinchen Hui
c2afd2765b Merge branch 'PHP-5.5' 2013-03-26 12:03:37 +08:00
Xinchen Hui
ed31582301 Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration) 2013-03-26 12:02:48 +08:00
Xinchen Hui
1182a3356c Update test script 2013-03-26 11:50:47 +08:00
Xinchen Hui
5e9377ebd5 Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration) 2013-03-26 11:44:57 +08:00
Xinchen Hui
c356038c6e Merge branch 'PHP-5.5' 2013-03-25 23:49:23 +08:00
Xinchen Hui
975d26667b Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse'). 2013-03-25 23:48:21 +08:00
Dmitry Stogov
0ff3065474 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  add new functions and constants for GD
 2013-03-25 15:49:18 +04:00
Dmitry Stogov
a4c386f32c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
 2013-03-25 15:48:13 +04:00
Dmitry Stogov
96e5f5eb05 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)

Conflicts:
	NEWS
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2013-03-25 15:47:45 +04:00
Dmitry Stogov
e9f996c00d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)

Conflicts:
	NEWS
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2013-03-25 15:23:49 +04:00
Pierre Joye
7da6272fe7 conflict 2013-03-25 12:20:01 +01:00
Dmitry Stogov
c4686b4de9 Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch) 2013-03-25 15:07:27 +04:00
David Soria Parra
04c659a042 Merge branch 'PHP-5.5' 
* PHP-5.5:
 2013-03-24 14:06:25 +01:00
Xinchen Hui
0bf7549772 Merge branch 'PHP-5.5' 2013-03-21 21:11:42 +08:00
Xinchen Hui
79925094c4 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 21:10:32 +08:00
Xinchen Hui
7dce0194c8 Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11) 2013-03-21 21:09:30 +08:00
Pierre Joye
bc7b287a61 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - add imageaffinematrixget and imagematrixconcat
  - add affine matrix helper for translate, scale, rotate and shear
  - fix unix build
  - add new files for interpolation
  - config.m4 sync with .w32
  - add new interpolation method   . imagescale   . imageaffine   . replace imagerotate with new generic and optimized new implementations   . imagesetinterpolationmethod, to set the default interpolation to be     used with the new functions   . add imagepalettetotruecolor
 2013-03-20 12:19:46 +01:00
Pierre Joye
22159fb7b7 - add new interpolation method 
. imagescale
  . imageaffine
  . replace imagerotate with new generic and optimized new implementations
  . imagesetinterpolationmethod, to set the default interpolation to be
    used with the new functions
  . add imagepalettetotruecolor
 2013-03-20 07:46:59 +01:00
Anatol Belski
3b922794ab Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix C90 compat
 2013-03-19 14:45:57 +01:00
Anatol Belski
6f0f5d5281 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix C90 compat
 2013-03-19 14:44:20 +01:00
Anatol Belski
7687b8b81c fix C90 compat 2013-03-19 14:42:18 +01:00
Dmitry Stogov
b8ab827e4f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)
 2013-03-19 17:05:36 +04:00
Dmitry Stogov
4837bdb910 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)

Conflicts:
	NEWS
 2013-03-19 17:04:35 +04:00
Dmitry Stogov
7b0993bfb4 Fixed bug #63976 (Parent class incorrectly using child constant in class property) 2013-03-19 16:59:01 +04:00
Dmitry Stogov
e72d059a0c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Partial fix for bug #64239
 2013-03-19 15:48:22 +04:00
Dmitry Stogov
960d5be528 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Partial fix for bug #64239
 2013-03-19 15:47:43 +04:00
Dmitry Stogov
984561cfa8 Partial fix for bug #64239 2013-03-19 15:45:48 +04:00
Dmitry Stogov
baa5b3ef74 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #62343 (Show class_alias In get_declared_classes())
 2013-03-19 15:01:05 +04:00
Dmitry Stogov
74e11fb14c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #62343 (Show class_alias In get_declared_classes())

Conflicts:
	NEWS
 2013-03-19 15:00:24 +04:00
Dmitry Stogov
84630a1109 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62343 (Show class_alias In get_declared_classes())
 2013-03-19 14:59:08 +04:00
Dmitry Stogov
4a6291508d Fixed bug #62343 (Show class_alias In get_declared_classes()) 2013-03-19 14:56:53 +04:00
Dmitry Stogov
b360d26294 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
 2013-03-19 13:08:14 +04:00
Dmitry Stogov
ef8c8eaa95 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)

Conflicts:
	NEWS
	Zend/zend_compile.c
 2013-03-19 13:07:32 +04:00
Dmitry Stogov
e62bb03257 Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error) 2013-03-19 12:48:23 +04:00
Dmitry Stogov
1b72240226 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Made test compatible with O+
 2013-03-16 16:11:41 +04:00
Dmitry Stogov
e9641141aa Made test compatible with O+ 2013-03-16 16:11:00 +04:00
Nikita Popov
279285598d Merge branch 'PHP-5.5' 2013-03-15 13:49:14 +01:00
Nikita Popov
b7788c52f1 Fix wrong macro usage and add missing NEWS entry 2013-03-15 13:48:33 +01:00
Dmitry Stogov
22b0f5d829 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Removed redundand code
 2013-03-14 14:22:51 +04: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