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
77,863 Commits 494 Branches 1,367 Tags 801 MiB
43cfa7f12a
Commit Graph

77863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
20318c4960 Added breaking upon fatal-ish error 2013-12-21 22:42:11 +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
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
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
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
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
d4f4b66d43 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-19 19:01:00 +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
Remi Collet
0fe9a9019b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
 2013-12-19 10:56:16 +01:00
Remi Collet
eda1cec694 NEWS 2013-12-19 10:56:07 +01:00
Remi Collet
f6ffecbd2d save a few memory 2013-12-19 10:55:26 +01:00
Remi Collet
99b91f98b1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
 2013-12-19 10:54:06 +01:00
Remi Collet
32d1d5fb59 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
 2013-12-19 10:53:50 +01:00
Remi Collet
20eb8e4d11 Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real) 2013-12-19 10:53:38 +01:00
Michael Wallner
17470df2a5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS handling section of README.GIT-RULES
 2013-12-19 10:08:27 +01:00
Michael Wallner
391fe528b7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS handling section of README.GIT-RULES
 2013-12-19 10:08:06 +01:00
Michael Wallner
3624a9ca7a Update NEWS handling section of README.GIT-RULES 
See http://marc.info/?t=138124004400005&r=1&w=2
 2013-12-19 10:07:46 +01:00
krakjoe
08393ad2ac disregard leading slash 2013-12-18 17:00:26 +00:00
krakjoe
944ebb36c8 version in userland 2013-12-18 16:33:21 +00:00
Dmitry Stogov
436ca2d019 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

Conflicts:
	NEWS
 2013-12-18 19:21:21 +04:00
Bob Weinand
d850deca94 Merge pull request #44 from Hywan/option_zend_version 
Add Zend version and copyright (oops, I merged the last PR too early)
 2013-12-18 07:20:11 -08:00
Dmitry Stogov
16e95d9137 Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. 2013-12-18 19:19:53 +04:00
Ivan Enderlin
1bc35a70d5 Add Zend version and copyright. 2013-12-18 16:15:24 +01:00
Bob Weinand
117d5e38e3 Merge pull request #43 from Hywan/option_version 
Add the `-V` option to print the version number
 2013-12-18 07:11:37 -08:00
Ivan Enderlin
abf68be7a4 Add the -V option to print the version number. 2013-12-18 16:05:11 +01:00
krakjoe
fc5f533c6f ... 2013-12-18 12:03:07 +00:00
Joe Watkins
5ccd5739f4 Merge pull request #40 from Hywan/fix_typo 
In english, no horizontal space before “!”
 2013-12-18 03:37:05 -08:00
Ivan Enderlin
e5263aa3f0 In english, no horizontal space before “!”. 2013-12-18 11:53:30 +01:00
krakjoe
7e0d1938f9 fix warnings/50700 stuff 2013-12-18 10:31:14 +00:00
krakjoe
5cc9a35f1b ... 2013-12-18 10:18:22 +00:00