]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Xinchen Hui [Wed, 25 Dec 2013 07:36:45 +0000 (15:36 +0800)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Wed, 25 Dec 2013 07:35:02 +0000 (15:35 +0800)]
Merge branch 'PHP-5.6'

11 years agoFix test
commit | commitdiff | tree
Xinchen Hui [Wed, 25 Dec 2013 07:34:39 +0000 (15:34 +0800)]
Fix test

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 25 Dec 2013 06:23:55 +0000 (22:23 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.25 next

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Wed, 25 Dec 2013 06:23:42 +0000 (22:23 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.25 next

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Wed, 25 Dec 2013 06:23:24 +0000 (22:23 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.25 next

Conflicts:
configure.in
main/php_version.h

11 years ago5.4.25 next
commit | commitdiff | tree
Stanislav Malyshev [Wed, 25 Dec 2013 06:22:04 +0000 (22:22 -0800)]
5.4.25 next

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 24 Dec 2013 20:09:45 +0000 (21:09 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed incompatible pointer in phpdbg on win64

11 years agofixed incompatible pointer in phpdbg on win64
commit | commitdiff | tree
Anatol Belski [Tue, 24 Dec 2013 20:08:33 +0000 (21:08 +0100)]
fixed incompatible pointer in phpdbg on win64

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Tue, 24 Dec 2013 12:20:12 +0000 (13:20 +0100)]
Merge branch 'PHP-5.6'

11 years agoFixed #18
commit | commitdiff | tree
Bob Weinand [Tue, 24 Dec 2013 12:11:57 +0000 (13:11 +0100)]
Fixed #18
Errors not displaying in some configurations

11 years agoMerge branch 'master' of sapi/phpdbg into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Tue, 24 Dec 2013 12:18:18 +0000 (13:18 +0100)]
Merge branch 'master' of sapi/phpdbg into PHP-5.6

 merge is necessary,

11 years agoFixed #18
commit | commitdiff | tree
Bob Weinand [Tue, 24 Dec 2013 12:11:57 +0000 (13:11 +0100)]
Fixed #18
Errors not displaying in some configurations

11 years agoupdate credits
commit | commitdiff | tree
Joe Watkins [Tue, 24 Dec 2013 09:04:32 +0000 (09:04 +0000)]
update credits

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
commit | commitdiff | tree
Joe Watkins [Tue, 24 Dec 2013 09:03:55 +0000 (09:03 +0000)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  fix NEWS file for master
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file

11 years agoupdate credits headers
commit | commitdiff | tree
Joe Watkins [Tue, 24 Dec 2013 09:03:22 +0000 (09:03 +0000)]
update credits headers

11 years agoMerge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
commit | commitdiff | tree
Joe Watkins [Tue, 24 Dec 2013 09:02:52 +0000 (09:02 +0000)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

* 'PHP-5.6' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Mon, 23 Dec 2013 23:37:20 +0000 (00:37 +0100)]
Merge branch 'PHP-5.6'

11 years agoFixed credits in phpdbg.* files
commit | commitdiff | tree
Bob Weinand [Mon, 23 Dec 2013 22:55:07 +0000 (23:55 +0100)]
Fixed credits in phpdbg.* files

11 years agoMerge branch 'master' of sapi/phpdbg into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Mon, 23 Dec 2013 23:33:25 +0000 (00:33 +0100)]
Merge branch 'master' of sapi/phpdbg into PHP-5.6

11 years agoAdded breaking upon fatal-ish error
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 21:42:11 +0000 (22:42 +0100)]
Added breaking upon fatal-ish error

11 years agofix NEWS file for master
commit | commitdiff | tree
Stanislav Malyshev [Mon, 23 Dec 2013 23:23:03 +0000 (15:23 -0800)]
fix NEWS file for master

11 years agocredits file for phpdbg
commit | commitdiff | tree
Joe Watkins [Mon, 23 Dec 2013 22:36:30 +0000 (22:36 +0000)]
credits file for phpdbg

11 years agoFixed credits in phpdbg.* files
commit | commitdiff | tree
Bob Weinand [Mon, 23 Dec 2013 22:55:07 +0000 (23:55 +0100)]
Fixed credits in phpdbg.* files

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Joe Watkins [Mon, 23 Dec 2013 22:37:36 +0000 (22:37 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  credits file for phpdbg

11 years agocredits file for phpdbg
commit | commitdiff | tree
Joe Watkins [Mon, 23 Dec 2013 22:36:30 +0000 (22:36 +0000)]
credits file for phpdbg

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 23 Dec 2013 22:10:44 +0000 (14:10 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  restore NEWS to the state of 6c5e93fe17c264aa28f8eeb4ec78c9e4a7eedfba

11 years agorestore NEWS to the state of 6c5e93fe17c264aa28f8eeb4ec78c9e4a7eedfba
commit | commitdiff | tree
Stanislav Malyshev [Mon, 23 Dec 2013 22:10:08 +0000 (14:10 -0800)]
restore NEWS to the state of 6c5e93fe17c264aa28f8eeb4ec78c9e4a7eedfba

11 years agoreformat
commit | commitdiff | tree
krakjoe [Mon, 23 Dec 2013 21:54:45 +0000 (21:54 +0000)]
reformat

11 years agoMerge branch 'master' of https://github.com/krakjoe/phpdbg
commit | commitdiff | tree
krakjoe [Mon, 23 Dec 2013 21:52:32 +0000 (21:52 +0000)]
Merge branch 'master' of https://github.com/krakjoe/phpdbg

11 years agocredits file
commit | commitdiff | tree
krakjoe [Mon, 23 Dec 2013 21:52:22 +0000 (21:52 +0000)]
credits file

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 12:54:54 +0000 (16:54 +0400)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)

11 years agoFixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 12:53:34 +0000 (16:53 +0400)]
Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 12:05:59 +0000 (16:05 +0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
  removed outdated IsDebuggerPresent declaration

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 12:05:38 +0000 (16:05 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  removed outdated IsDebuggerPresent declaration

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 12:05:18 +0000 (16:05 +0400)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)

11 years agoFixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 12:04:10 +0000 (16:04 +0400)]
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 23 Dec 2013 11:01:26 +0000 (12:01 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  removed outdated IsDebuggerPresent declaration

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Mon, 23 Dec 2013 11:01:10 +0000 (12:01 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  removed outdated IsDebuggerPresent declaration

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 23 Dec 2013 11:00:49 +0000 (12:00 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  removed outdated IsDebuggerPresent declaration

11 years agoremoved outdated IsDebuggerPresent declaration
commit | commitdiff | tree
Anatol Belski [Mon, 23 Dec 2013 10:53:47 +0000 (11:53 +0100)]
removed outdated IsDebuggerPresent declaration

This piece of code seems to retain compatibility with some windows
versions before 2000. Today it's not relevant anymore and only
produces a warning C4273 because of the conflicting prototype. In
VC9 the declaration is present in winbase.h:4142, but available
is it already in winxp. Here's the doc link
http://msdn.microsoft.com/en-us/library/windows/desktop/ms680345(v=vs.85).aspx

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 09:11:22 +0000 (13:11 +0400)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added suggestion about opcache.revalidate_freq setting in development environment

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 09:10:42 +0000 (13:10 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added suggestion about opcache.revalidate_freq setting in development environment

11 years agoAdded suggestion about opcache.revalidate_freq setting in development environment
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 09:09:45 +0000 (13:09 +0400)]
Added suggestion about opcache.revalidate_freq setting in development environment

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 08:52:27 +0000 (12:52 +0400)]
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 08:50:42 +0000 (12:50 +0400)]
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

11 years agoFixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_...
commit | commitdiff | tree
Dmitry Stogov [Mon, 23 Dec 2013 08:46:30 +0000 (12:46 +0400)]
Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"

11 years agoBump ZEND_MODULE_API_NO due to the TSRMLS change to zend_is_true()
commit | commitdiff | tree
Sara Golemon [Sun, 22 Dec 2013 22:10:59 +0000 (14:10 -0800)]
Bump ZEND_MODULE_API_NO due to the TSRMLS change to zend_is_true()

11 years agofix news
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 14:34:29 +0000 (14:34 +0000)]
fix news

11 years agofix news
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:30:41 +0000 (13:30 +0000)]
fix news

11 years agofix news file
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:27:38 +0000 (13:27 +0000)]
fix news file

11 years agoopcodes
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:20:41 +0000 (13:20 +0000)]
opcodes

11 years agoopcodes
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:20:17 +0000 (13:20 +0000)]
opcodes

11 years agomissing, apparently
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:19:35 +0000 (13:19 +0000)]
missing, apparently

11 years agoMerge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:17:21 +0000 (13:17 +0000)]
Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:15:40 +0000 (13:15 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  stop warnings from unused opcode map
  - BFN

Conflicts:
NEWS
Zend/zend_vm_opcodes.h

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:11:20 +0000 (13:11 +0000)]
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:07:41 +0000 (13:07 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  stop warnings from unused opcode map
  - BFN

11 years agostop warnings from unused opcode map
commit | commitdiff | tree
krakjoe [Sun, 22 Dec 2013 13:00:51 +0000 (13:00 +0000)]
stop warnings from unused opcode map

11 years ago- BFN
commit | commitdiff | tree
Felipe Pena [Sun, 22 Dec 2013 11:43:53 +0000 (09:43 -0200)]
- BFN

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Felipe Pena [Sun, 22 Dec 2013 11:43:29 +0000 (09:43 -0200)]
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Felipe Pena [Sun, 22 Dec 2013 11:43:10 +0000 (09:43 -0200)]
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Felipe Pena [Sun, 22 Dec 2013 11:42:58 +0000 (09:42 -0200)]
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

11 years ago- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: micha...
commit | commitdiff | tree
Felipe Pena [Sun, 22 Dec 2013 11:42:45 +0000 (09:42 -0200)]
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Sun, 22 Dec 2013 00:08:47 +0000 (01:08 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'master' of sapi/phpdbg into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Sun, 22 Dec 2013 00:04:31 +0000 (01:04 +0100)]
Merge branch 'master' of sapi/phpdbg into PHP-5.6

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 23:57:31 +0000 (00:57 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 23:55:46 +0000 (00:55 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_vm_opcodes.c

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 23:54:59 +0000 (00:54 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_opcodes.c

11 years agoIncluded new .c file in build too
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 23:52:05 +0000 (00:52 +0100)]
Included new .c file in build too

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 22:54:38 +0000 (23:54 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_vm_opcodes.h

11 years agoFixed little typo in zend_vm_gen.php
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 22:52:48 +0000 (23:52 +0100)]
Fixed little typo in zend_vm_gen.php

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 22:49:28 +0000 (23:49 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_opcodes.h

11 years agoMoved to new file, killing a lot of warnings
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 22:45:34 +0000 (23:45 +0100)]
Moved to new file, killing a lot of warnings

11 years agoAdded breaking upon fatal-ish error
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 21:42:11 +0000 (22:42 +0100)]
Added breaking upon fatal-ish error

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 20:33:15 +0000 (21:33 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 20:32:42 +0000 (21:32 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 20:31:48 +0000 (21:31 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_gen.php
Zend/zend_vm_opcodes.h

11 years agoFixed build...
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 20:29:08 +0000 (21:29 +0100)]
Fixed build...

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 18:32:41 +0000 (19:32 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 18:31:27 +0000 (19:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 18:27:58 +0000 (19:27 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoAdded an opcode to opcode name map
commit | commitdiff | tree
Bob Weinand [Sat, 21 Dec 2013 18:22:47 +0000 (19:22 +0100)]
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.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Christopher Jones [Fri, 20 Dec 2013 18:05:52 +0000 (10:05 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Align 'configure --help' columns
  Added NEWS and UPGRADING info for phpdbg

11 years agoAlign 'configure --help' columns
commit | commitdiff | tree
Christopher Jones [Fri, 20 Dec 2013 18:02:46 +0000 (10:02 -0800)]
Align 'configure --help' columns

11 years agoAdded NEWS and UPGRADING info for phpdbg
commit | commitdiff | tree
Bob Weinand [Fri, 20 Dec 2013 13:56:03 +0000 (14:56 +0100)]
Added NEWS and UPGRADING info for phpdbg

11 years agoMerge branch 'master' of https://git.php.net/push/php-src
commit | commitdiff | tree
Bob Weinand [Fri, 20 Dec 2013 13:36:28 +0000 (14:36 +0100)]
Merge branch 'master' of https://git.php.net/push/php-src

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Fri, 20 Dec 2013 13:35:40 +0000 (14:35 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.6' of http://git.php.net/repository/php-src into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Fri, 20 Dec 2013 13:29:35 +0000 (14:29 +0100)]
Merge branch 'PHP-5.6' of http://git.php.net/repository/php-src into PHP-5.6

11 years agoMerge branch 'master' of sapi/phpdbg into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Fri, 20 Dec 2013 13:27:51 +0000 (14:27 +0100)]
Merge branch 'master' of sapi/phpdbg into PHP-5.6
Including phpdbg.

11 years agoMerge branch 'master' of https://github.com/krakjoe/phpdbg
commit | commitdiff | tree
krakjoe [Fri, 20 Dec 2013 13:20:40 +0000 (13:20 +0000)]
Merge branch 'master' of https://github.com/krakjoe/phpdbg

11 years agoupdate readme
commit | commitdiff | tree
krakjoe [Fri, 20 Dec 2013 13:20:17 +0000 (13:20 +0000)]
update readme

11 years agoBumped version number to 0.3.0
commit | commitdiff | tree
Bob Weinand [Fri, 20 Dec 2013 13:03:51 +0000 (14:03 +0100)]
Bumped version number to 0.3.0

11 years agoRecreated test.php
commit | commitdiff | tree
Bob Weinand [Fri, 20 Dec 2013 12:56:21 +0000 (13:56 +0100)]
Recreated test.php

11 years agotidy up readme
commit | commitdiff | tree
krakjoe [Fri, 20 Dec 2013 12:52:18 +0000 (12:52 +0000)]
tidy up readme

11 years agotidy up repository for merging
commit | commitdiff | tree
krakjoe [Fri, 20 Dec 2013 12:51:24 +0000 (12:51 +0000)]
tidy up repository for merging

11 years agoMerge branch '5.6' into PHP-5.6
commit | commitdiff | tree
Boris Lytochkin [Thu, 19 Dec 2013 21:02:08 +0000 (01:02 +0400)]
Merge branch '5.6' into PHP-5.6

* 5.6:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)

11 years agoMerge branch '5.5' into PHP-5.5
commit | commitdiff | tree
Boris Lytochkin [Thu, 19 Dec 2013 21:01:41 +0000 (01:01 +0400)]
Merge branch '5.5' into PHP-5.5

* 5.5:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)

11 years agoMerge branch '5.4' into PHP-5.4
commit | commitdiff | tree
Boris Lytochkin [Thu, 19 Dec 2013 21:00:46 +0000 (01:00 +0400)]
Merge branch '5.4' into PHP-5.4

* 5.4:
  keep 'em sorted
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations

11 years agokeep 'em sorted
commit | commitdiff | tree
Boris Lytochkin [Thu, 19 Dec 2013 20:51:59 +0000 (00:51 +0400)]
keep 'em sorted

next
Unnamed repository; edit this file 'description' to name the repository.