clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,364 Commits 494 Branches 1,367 Tags 801 MiB
201128d39c
Commit Graph

73364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
201128d39c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
 2013-03-28 10:25:39 +01:00
Remi Collet
640e72ce91 With pkgconfig < 0.28 output is a single space 
With pkgconfig = 0.28 output is an empty string,
This breaks the test on the 2 vars

Need to split when
LIB set (ex -lssl -lcrypto)
INC empty (because /usr/include used)
 2013-03-28 10:22:20 +01:00
Dmitry Stogov
031553cd01 Fixed issue #78 (incorrect file path validation) 2013-03-28 12:30:18 +04:00
Xinchen Hui
7dd661d0cd Merge branch 'PHP-5.4' into PHP-5.5 2013-03-28 14:35:02 +08:00
Xinchen Hui
ab089611e0 Fix test on Mac (\D shows up) 2013-03-28 14:34:08 +08:00
Xinchen Hui
ae71c1d9aa Merge branch 'PHP-5.4' into PHP-5.5 2013-03-28 13:54:37 +08:00
Xinchen Hui
55341ac0a8 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-03-28 13:54:04 +08:00
Xinchen Hui
467cd6a60f Add test for #64529 2013-03-28 13:45:42 +08:00
Stanislav Malyshev
5d535a007d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  will be 5.4.15
  fix NEWS

Conflicts:
	configure.in
	main/php_version.h
 2013-03-27 14:02:14 -07:00
Stanislav Malyshev
f982aaafa7 will be 5.4.15 2013-03-27 14:00:12 -07:00
Stanislav Malyshev
210d43d7a2 fix NEWS 2013-03-27 13:57:53 -07: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
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
Dmitry Stogov
391a41e167 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Remove unused variable
  NEWS Section for beta 3
  News for beta 2
 2013-03-27 23:15:38 +04:00
Dmitry Stogov
1556d5df8a Fixed issue #74 (Allowed per request OPcache disabling) 2013-03-27 23:13:21 +04:00
David Soria Parra
f92a15864b Remove unused variable 2013-03-27 20:00:54 +01:00
David Soria Parra
ef6cdb85d9 NEWS Section for beta 3 2013-03-27 19:57:24 +01:00
David Soria Parra
2185746feb News for beta 2 2013-03-27 19:30:43 +01:00
Dmitry Stogov
91ab11ed07 Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all) 2013-03-27 22:16:18 +04:00
Dmitry Stogov
fc7efecda0 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 WebP support in phpinfo
 2013-03-27 21:09:51 +04:00
Dmitry Stogov
26f3ff25fe Added opcache.enable_cli=0 2013-03-27 21:08:18 +04:00
Dmitry Stogov
f139534694 Added description for opcache.enable_cli 2013-03-27 21:02:39 +04:00
Pierre Joye
e7d88a63fa add WebP support in phpinfo 2013-03-27 17:38:57 +01:00
Pierre Joye
f01a7e54d3 add windows 8 and windows server 2012 2013-03-27 07:29:47 +01:00
Pierre Joye
d0aa831614 versions no longer supported, no need to check 2013-03-27 07:15:23 +01:00
Pierre Joye
f3ebb40ad6 FALSE on error 2013-03-27 05:13:30 +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
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
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
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
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
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
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
6a7088fd18 back to dev (7.0.2-dev) 2013-03-25 13:57:50 +04:00
Dmitry Stogov
f17156c2d1 Fixed copy/paste mistake 2013-03-25 13:30:45 +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
a3316ffe6a 7.0.1 release 2013-03-25 11:44:09 +04:00