granicus.if.org Git

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

commit | commitdiff | tree

Joe Watkins [Mon, 23 Dec 2013 22:36:30 +0000 (22:36 +0000)]

credits file for phpdbg

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

commit | commitdiff | tree

Stanislav Malyshev [Mon, 23 Dec 2013 22:10:08 +0000 (14:10 -0800)]

restore NEWS to the state of 6c5e93fe17c264aa28f8eeb4ec78c9e4a7eedfba

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)

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)

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

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

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)

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)

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

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

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

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

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

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

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

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

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

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"

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()

Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6

Merge branch 'PHP-5.6'

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

Conflicts:
NEWS
Zend/zend_vm_opcodes.h

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

Merge branch 'PHP-5.4' into PHP-5.5

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

stop warnings from unused opcode map

commit | commitdiff | tree

Felipe Pena [Sun, 22 Dec 2013 11:43:53 +0000 (09:43 -0200)]

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

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

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

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

commit | commitdiff | tree

Bob Weinand [Sun, 22 Dec 2013 00:08:47 +0000 (01:08 +0100)]

Merge branch '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

commit | commitdiff | tree

Bob Weinand [Sat, 21 Dec 2013 23:57:31 +0000 (00:57 +0100)]

Merge branch '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

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

commit | commitdiff | tree

Bob Weinand [Sat, 21 Dec 2013 23:52:05 +0000 (00:52 +0100)]

Included new .c file in build too

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

commit | commitdiff | tree

Bob Weinand [Sat, 21 Dec 2013 22:52:48 +0000 (23:52 +0100)]

Fixed little typo in zend_vm_gen.php

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

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

commit | commitdiff | tree

Bob Weinand [Sat, 21 Dec 2013 21:42:11 +0000 (22:42 +0100)]

Added breaking upon fatal-ish error

commit | commitdiff | tree

Bob Weinand [Sat, 21 Dec 2013 20:33:15 +0000 (21:33 +0100)]

Merge branch '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

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

commit | commitdiff | tree

Bob Weinand [Sat, 21 Dec 2013 20:29:08 +0000 (21:29 +0100)]

commit | commitdiff | tree

Bob Weinand [Sat, 21 Dec 2013 18:32:41 +0000 (19:32 +0100)]

Merge branch '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

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

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.

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

commit | commitdiff | tree

Christopher Jones [Fri, 20 Dec 2013 18:02:46 +0000 (10:02 -0800)]

Align 'configure --help' columns

commit | commitdiff | tree

Bob Weinand [Fri, 20 Dec 2013 13:56:03 +0000 (14:56 +0100)]

Added NEWS and UPGRADING info for phpdbg

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

commit | commitdiff | tree

Bob Weinand [Fri, 20 Dec 2013 13:35:40 +0000 (14:35 +0100)]

Merge branch '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

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.

Merge branch 'master' of https://github.com/krakjoe/phpdbg

commit | commitdiff | tree

Bob Weinand [Fri, 20 Dec 2013 13:03:51 +0000 (14:03 +0100)]

Bumped version number to 0.3.0

commit | commitdiff | tree

Bob Weinand [Fri, 20 Dec 2013 12:56:21 +0000 (13:56 +0100)]

tidy up repository for merging

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)

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)

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

commit | commitdiff | tree

Boris Lytochkin [Thu, 19 Dec 2013 20:51:59 +0000 (00:51 +0400)]

commit | commitdiff | tree

Boris Lytochkin [Thu, 19 Dec 2013 20:47:26 +0000 (00:47 +0400)]

Merge branch '5.6'

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

commit | commitdiff | tree

Boris Lytochkin [Thu, 19 Dec 2013 20:39:15 +0000 (00:39 +0400)]

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

commit | commitdiff | tree

Boris Lytochkin [Thu, 19 Dec 2013 20:37:29 +0000 (00:37 +0400)]

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

commit | commitdiff | tree

Boris Lytochkin [Thu, 19 Dec 2013 20:26:34 +0000 (00:26 +0400)]

Merge branch '5.4' into 5.5

* 5.4:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations

commit | commitdiff | tree

Boris Lytochkin [Thu, 19 Dec 2013 20:25:16 +0000 (00:25 +0400)]

Fixed SNMP_ERR_TOOBIG handling for bulk walk operations

commit | commitdiff | tree

Derick Rethans [Thu, 19 Dec 2013 19:01:08 +0000 (19:01 +0000)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Thu, 19 Dec 2013 19:01:00 +0000 (19:01 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Thu, 19 Dec 2013 18:58:48 +0000 (18:58 +0000)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Derick Rethans [Thu, 19 Dec 2013 18:58:45 +0000 (18:58 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Thu, 19 Dec 2013 18:58:44 +0000 (18:58 +0000)]

- Updated to version 2013.9 (2013i)

commit | commitdiff | tree

Remi Collet [Thu, 19 Dec 2013 09:56:25 +0000 (10:56 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  save a few memory
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)

commit | commitdiff | tree

Remi Collet [Thu, 19 Dec 2013 09:56:16 +0000 (10:56 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS

commit | commitdiff | tree

Remi Collet [Thu, 19 Dec 2013 09:56:07 +0000 (10:56 +0100)]

commit | commitdiff | tree

Remi Collet [Thu, 19 Dec 2013 09:55:26 +0000 (10:55 +0100)]

commit | commitdiff | tree

Remi Collet [Thu, 19 Dec 2013 09:54:06 +0000 (10:54 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)

commit | commitdiff | tree

Remi Collet [Thu, 19 Dec 2013 09:53:50 +0000 (10:53 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)

commit | commitdiff | tree

Remi Collet [Thu, 19 Dec 2013 09:53:38 +0000 (10:53 +0100)]

Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)

commit | commitdiff | tree

Michael Wallner [Thu, 19 Dec 2013 09:10:09 +0000 (10:10 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Update NEWS handling section of README.GIT-RULES

commit | commitdiff | tree

Michael Wallner [Thu, 19 Dec 2013 09:08:27 +0000 (10:08 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Update NEWS handling section of README.GIT-RULES

commit | commitdiff | tree

Michael Wallner [Thu, 19 Dec 2013 09:08:06 +0000 (10:08 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS handling section of README.GIT-RULES

commit | commitdiff | tree

Michael Wallner [Thu, 19 Dec 2013 09:04:32 +0000 (10:04 +0100)]

Update NEWS handling section of README.GIT-RULES

See http://marc.info/?t=138124004400005&r=1&w=2

disregard leading slash

commit | commitdiff | tree

Bob Weinand [Wed, 18 Dec 2013 15:44:20 +0000 (16:44 +0100)]

Fixed ZTS build. Needed to bump API version number.

commit | commitdiff | tree

Dmitry Stogov [Wed, 18 Dec 2013 15:22:05 +0000 (19:22 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

commit | commitdiff | tree

Dmitry Stogov [Wed, 18 Dec 2013 15:21:21 +0000 (19:21 +0400)]

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