clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,871 Commits 494 Branches 1,367 Tags 809 MiB
705ab20252
Commit Graph

73871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Joye
705ab20252 Merge branch 'PHP-5.5' 
* PHP-5.5:
  FALSE on error
 2013-03-27 05:13:42 +01:00
Pierre Joye
f3ebb40ad6 FALSE on error 2013-03-27 05:13:30 +01:00
Pierre Joye
8a85da4a61 merging conflict left over 2013-03-26 17:46:29 +01:00
Pierre Joye
4d73bb070e Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-26 11:24:48 +01:00
Pierre Joye
3b48dc0848 Merge branch 'master' of git.php.net:php-src 2013-03-26 11:24:30 +01:00
Pierre Joye
111123af4f conflict 2013-03-26 11:24:00 +01:00
Pierre Joye
5ae6f582fb fix regression, take #2 (merge issue due to git 1.8 default setting changes) 2013-03-26 11:23:15 +01: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
0496ad31ac Merge branch 'PHP-5.4' into PHP-5.5 2013-03-26 11:51:15 +08:00
Xinchen Hui
1182a3356c Update test script 2013-03-26 11:50:47 +08:00
Xinchen Hui
62ec3893d2 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-26 11:47:38 +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
Pierre Joye
c6e911e154 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-25 13:43:22 +01:00
Pierre Joye
b6fa581d2d Merge branch 'master' of git.php.net:php-src 2013-03-25 13:43:08 +01:00
Pierre Joye
317168bb1e Merge branch 'PHP-5.5' 
* PHP-5.5:
  typo and WS
 2013-03-25 13:42:42 +01:00
Pierre Joye
0171bcb9fa typo and WS 2013-03-25 13:42:29 +01:00
Dmitry Stogov
65afa3c044 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  add new functions and constants for GD
 2013-03-25 15:49:41 +04: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
878bef2a1d Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-25 12:22:20 +01:00
Pierre Joye
d836e654bb Merge branch 'master' of git.php.net:php-src 2013-03-25 12:20:21 +01:00
Pierre Joye
7da6272fe7 conflict 2013-03-25 12:20:01 +01:00
Pierre Joye
1c662dc303 add new functions and constants for GD 2013-03-25 12:15:46 +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
Dmitry Stogov
d74a192bd4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  back to dev (7.0.2-dev)
 2013-03-25 13:58:12 +04:00
Dmitry Stogov
6a7088fd18 back to dev (7.0.2-dev) 2013-03-25 13:57:50 +04:00
Dmitry Stogov
57a0c655aa Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed copy/paste mistake
 2013-03-25 13:31:19 +04:00
Dmitry Stogov
f17156c2d1 Fixed copy/paste mistake 2013-03-25 13:30:45 +04:00
Dmitry Stogov
dedd0f56b6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
  Separate "start_time" from "last_restart_time"
  Fixed PHP-5.2 ZTS compatibility
 2013-03-25 13:06:10 +04:00
Dmitry Stogov
0a00d29256 Fixed bug #64482 (Opcodes for dynamic includes should not be cached) 2013-03-25 13:05:16 +04:00
Dmitry Stogov
64b029af0d Separate "start_time" from "last_restart_time" 2013-03-25 12:33:24 +04:00
Dmitry Stogov
987dee9ca1 Fixed PHP-5.2 ZTS compatibility 2013-03-25 12:21:58 +04:00
Dmitry Stogov
2c22ffc909 Merge branch 'PHP-5.5' 
* PHP-5.5:
  7.0.1 release
 2013-03-25 11:45:12 +04:00
Dmitry Stogov
a3316ffe6a 7.0.1 release 2013-03-25 11:44:09 +04:00
Stanislav Malyshev
4003cc23b1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  make it int main
 2013-03-24 23:58:50 -07:00
Stanislav Malyshev
c20e4bbc96 make it int main 2013-03-24 23:58:30 -07:00
Stanislav Malyshev
981cd9c500 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix return value
 2013-03-24 23:43:45 -07:00
Stanislav Malyshev
016fbd9991 fix return value 2013-03-24 23:43:25 -07:00
Stanislav Malyshev
9e86fa301f Merge branch 'PHP-5.5' 
* PHP-5.5:
  add code to check if we know flock definition on this system
 2013-03-24 20:12:33 -07:00
Stanislav Malyshev
385d0e52cc add code to check if we know flock definition on this system 
In order to configure detect it and not fail the compile.
Not an ideal solution, suggestions are welcome on how to improve it.
 2013-03-24 20:11:28 -07:00
Stanislav Malyshev
f25c3283ae Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix typo
  add definition for 5.5
 2013-03-24 20:04:28 -07:00
Stanislav Malyshev
c1ac5a20a5 fix typo 2013-03-24 20:04:24 -07:00
Stanislav Malyshev
bf457a0387 add definition for 5.5 2013-03-24 20:04:24 -07:00
Stanislav Malyshev
504ef64c7b fix typo 2013-03-24 20:03:57 -07:00
Stanislav Malyshev
7c0bdb9a4f add definition for 5.5 2013-03-24 19:54:10 -07:00