php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-09 09:03:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
77,995 Commits 547 Branches 1,483 Tags
e700cbff22bac6df9585edef7fa6fd70abc69f76
Commit Graph

77995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
krakjoe
d5c685adba tidy up readme 2013-12-20 12:52:18 +00:00
krakjoe
329e16a250 tidy up repository for merging 2013-12-20 12:51:24 +00:00
Boris Lytochkin
5ce843abcb Merge branch '5.6' into PHP-5.6 
* 5.6:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
 2013-12-20 01:02:08 +04:00
Boris Lytochkin
e195faa18f Merge branch '5.5' into PHP-5.5 
* 5.5:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
 2013-12-20 01:01:41 +04:00
Boris Lytochkin
a6fa52028f Merge branch '5.4' into PHP-5.4 
* 5.4:
  keep 'em sorted
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
 2013-12-20 01:00:46 +04:00
Boris Lytochkin
a7c50ccc67 keep 'em sorted 2013-12-20 00:51:59 +04:00
Boris Lytochkin
ba51a375ae Merge branch '5.6' 
* 5.6:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
 2013-12-20 00:47:26 +04:00
Boris Lytochkin
285c0bcec0 Merge branch '5.5' into 5.6 
* 5.5:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
 2013-12-20 00:39:15 +04:00
Boris Lytochkin
324eb07440 Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin) 2013-12-20 00:37:29 +04:00
Boris Lytochkin
b65bd30e89 Merge branch '5.4' into 5.5 
* 5.4:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
 2013-12-20 00:26:34 +04:00
Boris Lytochkin
bb51d0e4c0 Fixed SNMP_ERR_TOOBIG handling for bulk walk operations 2013-12-20 00:25:16 +04:00
Derick Rethans
db025b3789 Merge branch 'PHP-5.6' 2013-12-19 19:01:08 +00:00
Derick Rethans
d4f4b66d43 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-19 19:01:00 +00:00
Derick Rethans
e1a5edaac2 Merge branch 'PHP-5.5' 2013-12-19 18:58:48 +00:00
Derick Rethans
7a402ca51e Merge branch 'PHP-5.4' into PHP-5.5 2013-12-19 18:58:45 +00:00
Derick Rethans
e881334e49 - Updated to version 2013.9 (2013i) 2013-12-19 18:58:44 +00:00