php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,011 Commits 549 Branches 1,484 Tags
5bc9e006e89954dc4e26b1bea945a22d5c24a231
Commit Graph

78011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov 5bc9e006e8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  fix news
  opcodes
  opcodes

Conflicts:
	NEWS
 2013-12-23 12:52:27 +04:00
Dmitry Stogov f5c200fce9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  opcodes
 2013-12-23 12:50:42 +04:00
Dmitry Stogov 0dcaf0f445 Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" 2013-12-23 12:46:30 +04:00
Sara Golemon 6a2a2b52f9 Bump ZEND_MODULE_API_NO due to the TSRMLS change to zend_is_true() 2013-12-22 14:10:59 -08:00
krakjoe befdd1770a fix news 2013-12-22 14:34:29 +00:00
krakjoe ee55edf5e4 fix news 2013-12-22 13:30:41 +00:00
krakjoe 523a6b50ae fix news file 2013-12-22 13:27:38 +00:00
krakjoe 704866d6fd opcodes 2013-12-22 13:20:41 +00:00
krakjoe d455377fad opcodes 2013-12-22 13:20:17 +00:00
krakjoe 8ce521a6a7 missing, apparently 2013-12-22 13:19:35 +00:00
krakjoe df9f2ad2e9 Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6 2013-12-22 13:17:21 +00:00
krakjoe 621862a192 Merge branch 'PHP-5.6' 
* PHP-5.6:
  stop warnings from unused opcode map
  - BFN

Conflicts:
	NEWS
	Zend/zend_vm_opcodes.h
 2013-12-22 13:15:40 +00:00
krakjoe 2a1b60569f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  stop warnings from unused opcode map
  - BFN
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
  Included new .c file in build too
  Fixed little typo in zend_vm_gen.php
  Moved to new file, killing a lot of warnings
 2013-12-22 13:11:20 +00:00
krakjoe 247ec0d81f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  stop warnings from unused opcode map
  - BFN
 2013-12-22 13:07:41 +00:00
krakjoe b1df00a7c9 stop warnings from unused opcode map 2013-12-22 13:00:51 +00:00
Felipe Pena c14388d63f - BFN 2013-12-22 09:43:53 -02:00
Felipe Pena e700cbff22 Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
 2013-12-22 09:43:29 -02:00
Felipe Pena 9f1075bb29 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
 2013-12-22 09:43:10 -02:00
Felipe Pena 8e36d36ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
 2013-12-22 09:42:58 -02:00
Felipe Pena a056113586 - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com 2013-12-22 09:42:45 -02:00
Bob Weinand 2bf271bbb0 Merge branch 'PHP-5.6' 2013-12-22 01:08:47 +01:00
Bob Weinand 0525dce3c8 Merge branch 'master' of sapi/phpdbg into PHP-5.6 2013-12-22 01:04:31 +01:00
Bob Weinand 5b1f6caaf0 Merge branch 'PHP-5.6' 2013-12-22 00:57:31 +01:00
Bob Weinand 129fb22b37 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	Zend/zend_vm_opcodes.c
 2013-12-22 00:55:46 +01:00
Bob Weinand 7e3af096b3 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_opcodes.c
 2013-12-22 00:54:59 +01:00
Bob Weinand 97bf254385 Included new .c file in build too 2013-12-22 00:52:05 +01:00
Bob Weinand 2874eba714 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	Zend/zend_vm_opcodes.h
 2013-12-21 23:54:38 +01:00
Bob Weinand 00cc4dccb8 Fixed little typo in zend_vm_gen.php 2013-12-21 23:52:48 +01:00
Bob Weinand 0dd2765687 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_opcodes.h
 2013-12-21 23:49:28 +01:00
Bob Weinand 61199be02f Moved to new file, killing a lot of warnings 2013-12-21 23:45:34 +01:00
Bob Weinand 20318c4960 Added breaking upon fatal-ish error 2013-12-21 22:42:11 +01:00
Bob Weinand 0cc89be244 Merge branch 'PHP-5.6' 2013-12-21 21:33:15 +01:00
Bob Weinand b14f31872b Merge branch 'PHP-5.5' into PHP-5.6 2013-12-21 21:32:42 +01:00
Bob Weinand 560f90e511 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_gen.php
	Zend/zend_vm_opcodes.h
 2013-12-21 21:31:48 +01:00
Bob Weinand 7894e397d8 Fixed build... 2013-12-21 21:29:08 +01:00
Bob Weinand e2b75e5bb7 Merge branch 'PHP-5.6' 2013-12-21 19:32:41 +01:00
Bob Weinand 9b4b5fa737 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-21 19:31:27 +01:00
Bob Weinand b52c300eca Merge branch 'PHP-5.4' into PHP-5.5 2013-12-21 19:27:58 +01:00
Bob Weinand 50d50c2f04 Added an opcode to opcode name map 
That way extensions etc. don't have to maintain their own lists anymore.
Also as phpdbg is included and needs such a map, it'd be counterproductive to need to change two things on every new opcode.
 2013-12-21 19:22:47 +01:00
Christopher Jones 1b1b706818 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Align 'configure --help' columns
  Added NEWS and UPGRADING info for phpdbg
 2013-12-20 10:05:52 -08:00
Christopher Jones 794df91c35 Align 'configure --help' columns 2013-12-20 10:02:46 -08:00
Bob Weinand 6c5e93fe17 Added NEWS and UPGRADING info for phpdbg 2013-12-20 14:56:03 +01:00
Bob Weinand 3926362d30 Merge branch 'master' of https://git.php.net/push/php-src 2013-12-20 14:36:28 +01:00
Bob Weinand f500be8838 Merge branch 'PHP-5.6' 2013-12-20 14:35:40 +01:00
Bob Weinand 4ae4b7bf47 Merge branch 'PHP-5.6' of http://git.php.net/repository/php-src into PHP-5.6 2013-12-20 14:29:35 +01:00
Bob Weinand cee72c13d7 Merge branch 'master' of sapi/phpdbg into PHP-5.6 
Including phpdbg.
 2013-12-20 14:27:51 +01:00
krakjoe ef3e0119b8 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-12-20 13:20:40 +00:00
krakjoe 37eac64e36 update readme 2013-12-20 13:20:17 +00:00
Bob Weinand f06ac6a531 Bumped version number to 0.3.0 2013-12-20 14:03:51 +01:00
Bob Weinand 937cc7c80a Recreated test.php 2013-12-20 13:56:21 +01:00