]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Thu, 28 Mar 2013 05:55:06 +0000 (13:55 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Thu, 28 Mar 2013 05:54:37 +0000 (13:54 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
commit | commitdiff | tree
Xinchen Hui [Thu, 28 Mar 2013 05:54:04 +0000 (13:54 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

11 years agoAdd test for #64529
commit | commitdiff | tree
Xinchen Hui [Thu, 28 Mar 2013 05:45:42 +0000 (13:45 +0800)]
Add test for #64529

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 27 Mar 2013 21:02:45 +0000 (14:02 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  will be 5.4.15
  fix NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Wed, 27 Mar 2013 21:02:14 +0000 (14:02 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  will be 5.4.15
  fix NEWS

Conflicts:
configure.in
main/php_version.h

11 years agowill be 5.4.15
commit | commitdiff | tree
Stanislav Malyshev [Wed, 27 Mar 2013 20:59:29 +0000 (13:59 -0700)]
will be 5.4.15

11 years agofix NEWS
commit | commitdiff | tree
Stanislav Malyshev [Wed, 27 Mar 2013 20:57:53 +0000 (13:57 -0700)]
fix NEWS

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Lars Strojny [Wed, 27 Mar 2013 20:37:42 +0000 (21:37 +0100)]
Merge branch 'PHP-5.5'

Conflicts:
Zend/zend_ini_scanner.c

11 years agoAdded XOR support for expressions in INI parser: NEWS and zend_language_scanner.c
commit | commitdiff | tree
Lars Strojny [Wed, 27 Mar 2013 20:30:56 +0000 (21:30 +0100)]
Added XOR support for expressions in INI parser: NEWS and zend_language_scanner.c

11 years agoAdded XOR support for expressions in INI parser
commit | commitdiff | tree
Dejan Marjanovic [Tue, 26 Mar 2013 22:54:09 +0000 (23:54 +0100)]
Added XOR support for expressions in INI parser

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 20:10:13 +0000 (00:10 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
Zend/zend_language_scanner.c

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 20:08:11 +0000 (00:08 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
NEWS
Zend/zend_execute_API.c
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h

11 years agoFixed bug #64529 (Ran out of opcode space)
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 20:03:40 +0000 (00:03 +0400)]
Fixed bug #64529 (Ran out of opcode space)

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 19:15:38 +0000 (23:15 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Remove unused variable
  NEWS Section for beta 3
  News for beta 2

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 19:15:21 +0000 (23:15 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Remove unused variable
  NEWS Section for beta 3
  News for beta 2

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 19:14:59 +0000 (23:14 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed issue #74 (Allowed per request OPcache disabling)

11 years agoFixed issue #74 (Allowed per request OPcache disabling)
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 19:13:21 +0000 (23:13 +0400)]
Fixed issue #74 (Allowed per request OPcache disabling)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
David Soria Parra [Wed, 27 Mar 2013 19:01:05 +0000 (20:01 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove unused variable

11 years agoRemove unused variable
commit | commitdiff | tree
David Soria Parra [Wed, 27 Mar 2013 19:00:54 +0000 (20:00 +0100)]
Remove unused variable

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
David Soria Parra [Wed, 27 Mar 2013 18:58:10 +0000 (19:58 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS Section for beta 3
  News for beta 2

11 years agoNEWS Section for beta 3
commit | commitdiff | tree
David Soria Parra [Wed, 27 Mar 2013 18:57:24 +0000 (19:57 +0100)]
NEWS Section for beta 3

11 years agoNews for beta 2
commit | commitdiff | tree
David Soria Parra [Wed, 27 Mar 2013 18:30:43 +0000 (19:30 +0100)]
News for beta 2

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 18:17:50 +0000 (22:17 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all)

11 years agoFixed issue #76 (actually we don't need zend_shared_memory_block_header at all)
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 18:16:18 +0000 (22:16 +0400)]
Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all)

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 17:09:51 +0000 (21:09 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  add WebP support in phpinfo

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 17:09:31 +0000 (21:09 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  add WebP support in phpinfo

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 17:08:58 +0000 (21:08 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added opcache.enable_cli=0

11 years agoAdded opcache.enable_cli=0
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 17:08:18 +0000 (21:08 +0400)]
Added opcache.enable_cli=0

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 17:04:04 +0000 (21:04 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added description for opcache.enable_cli

11 years agoAdded description for opcache.enable_cli
commit | commitdiff | tree
Dmitry Stogov [Wed, 27 Mar 2013 17:02:39 +0000 (21:02 +0400)]
Added description for opcache.enable_cli

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Wed, 27 Mar 2013 16:39:05 +0000 (17:39 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  add WebP support in phpinfo

11 years agoadd WebP support in phpinfo
commit | commitdiff | tree
Pierre Joye [Wed, 27 Mar 2013 16:38:57 +0000 (17:38 +0100)]
add WebP support in phpinfo

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Wed, 27 Mar 2013 06:29:56 +0000 (07:29 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  add windows 8 and windows server 2012

11 years agoadd windows 8 and windows server 2012
commit | commitdiff | tree
Pierre Joye [Wed, 27 Mar 2013 06:29:47 +0000 (07:29 +0100)]
add windows 8 and windows server 2012

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Wed, 27 Mar 2013 06:15:30 +0000 (07:15 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  versions no longer supported, no need to check

11 years agoversions no longer supported, no need to check
commit | commitdiff | tree
Pierre Joye [Wed, 27 Mar 2013 06:15:23 +0000 (07:15 +0100)]
versions no longer supported, no need to check

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Wed, 27 Mar 2013 04:13:42 +0000 (05:13 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  FALSE on error

11 years ago FALSE on error
commit | commitdiff | tree
Pierre Joye [Wed, 27 Mar 2013 04:13:30 +0000 (05:13 +0100)]
 FALSE on error

11 years agomerging conflict left over
commit | commitdiff | tree
Pierre Joye [Tue, 26 Mar 2013 16:46:29 +0000 (17:46 +0100)]
merging conflict left over

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Pierre Joye [Tue, 26 Mar 2013 10:24:48 +0000 (11:24 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Pierre Joye [Tue, 26 Mar 2013 10:24:30 +0000 (11:24 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoconflict
commit | commitdiff | tree
Pierre Joye [Tue, 26 Mar 2013 10:24:00 +0000 (11:24 +0100)]
conflict

11 years agofix regression, take #2 (merge issue due to git 1.8 default setting changes)
commit | commitdiff | tree
Pierre Joye [Tue, 26 Mar 2013 10:23:15 +0000 (11:23 +0100)]
fix regression, take #2 (merge issue due to git 1.8 default setting changes)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Tue, 26 Mar 2013 04:03:37 +0000 (12:03 +0800)]
Merge branch 'PHP-5.5'

11 years agoFixed bug #64515 (Memoryleak when using the same variablename 2times in function...
commit | commitdiff | tree
Xinchen Hui [Tue, 26 Mar 2013 04:02:48 +0000 (12:02 +0800)]
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Tue, 26 Mar 2013 03:51:15 +0000 (11:51 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoUpdate test script
commit | commitdiff | tree
Xinchen Hui [Tue, 26 Mar 2013 03:50:47 +0000 (11:50 +0800)]
Update test script

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Tue, 26 Mar 2013 03:47:38 +0000 (11:47 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #64515 (Memoryleak when using the same variablename 2times in function...
commit | commitdiff | tree
Xinchen Hui [Tue, 26 Mar 2013 03:44:57 +0000 (11:44 +0800)]
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Mon, 25 Mar 2013 15:49:23 +0000 (23:49 +0800)]
Merge branch 'PHP-5.5'

11 years agoFixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
commit | commitdiff | tree
Xinchen Hui [Mon, 25 Mar 2013 15:48:21 +0000 (23:48 +0800)]
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 12:43:22 +0000 (13:43 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 12:43:08 +0000 (13:43 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 12:42:42 +0000 (13:42 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  typo and WS

11 years agotypo and WS
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 12:42:29 +0000 (13:42 +0100)]
typo and WS

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 11:49:41 +0000 (15:49 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  add new functions and constants for GD

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 11:49:18 +0000 (15:49 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  add new functions and constants for GD

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 11:48:13 +0000 (15:48 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 11:47:45 +0000 (15:47 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)

Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 11:23:49 +0000 (15:23 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)

Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 11:22:20 +0000 (12:22 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 11:20:21 +0000 (12:20 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoconflict
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 11:20:01 +0000 (12:20 +0100)]
conflict

11 years agoadd new functions and constants for GD
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 11:15:46 +0000 (12:15 +0100)]
add new functions and constants for GD

11 years agoFixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properl...
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 11:07:27 +0000 (15:07 +0400)]
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 09:58:12 +0000 (13:58 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  back to dev (7.0.2-dev)

11 years agoback to dev (7.0.2-dev)
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 09:57:50 +0000 (13:57 +0400)]
back to dev (7.0.2-dev)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 09:31:19 +0000 (13:31 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed copy/paste mistake

11 years agoFixed copy/paste mistake
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 09:30:45 +0000 (13:30 +0400)]
Fixed copy/paste mistake

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 09:06:10 +0000 (13:06 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
  Separate "start_time" from "last_restart_time"
  Fixed PHP-5.2 ZTS compatibility

11 years agoFixed bug #64482 (Opcodes for dynamic includes should not be cached)
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 09:05:16 +0000 (13:05 +0400)]
Fixed bug #64482 (Opcodes for dynamic includes should not be cached)

11 years agoSeparate "start_time" from "last_restart_time"
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 08:33:24 +0000 (12:33 +0400)]
Separate "start_time" from "last_restart_time"

11 years agoFixed PHP-5.2 ZTS compatibility
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 08:21:58 +0000 (12:21 +0400)]
Fixed PHP-5.2 ZTS compatibility

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 07:45:12 +0000 (11:45 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  7.0.1 release

11 years ago7.0.1 release
commit | commitdiff | tree
Dmitry Stogov [Mon, 25 Mar 2013 07:44:09 +0000 (11:44 +0400)]
7.0.1 release

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 06:58:50 +0000 (23:58 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  make it int main

11 years agomake it int main
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 06:58:30 +0000 (23:58 -0700)]
make it int main

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 06:43:45 +0000 (23:43 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix return value

11 years agofix return value
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 06:43:25 +0000 (23:43 -0700)]
fix return value

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 03:12:33 +0000 (20:12 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  add code to check if we know flock definition on this system

11 years agoadd code to check if we know flock definition on this system
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 03:11:28 +0000 (20:11 -0700)]
add code to check if we know flock definition on this system

In order to configure detect it and not fail the compile.
Not an ideal solution, suggestions are welcome on how to improve it.

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 03:04:28 +0000 (20:04 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix typo
  add definition for 5.5

11 years agofix typo
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 03:03:57 +0000 (20:03 -0700)]
fix typo

11 years agoadd definition for 5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 02:54:10 +0000 (19:54 -0700)]
add definition for 5.5

11 years agofix typo
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 03:03:57 +0000 (20:03 -0700)]
fix typo

11 years agoadd definition for 5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 02:54:10 +0000 (19:54 -0700)]
add definition for 5.5

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 02:19:08 +0000 (03:19 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 02:17:59 +0000 (03:17 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 02:14:40 +0000 (03:14 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  remove comments

11 years agoremove comments
commit | commitdiff | tree
Pierre Joye [Mon, 25 Mar 2013 02:14:27 +0000 (03:14 +0100)]
remove comments

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 02:07:43 +0000 (19:07 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

11 years agofix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 02:03:04 +0000 (19:03 -0700)]
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 02:04:43 +0000 (19:04 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

11 years agofix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
commit | commitdiff | tree
Stanislav Malyshev [Mon, 25 Mar 2013 02:03:04 +0000 (19:03 -0700)]
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Nikita Popov [Sun, 24 Mar 2013 16:55:01 +0000 (17:55 +0100)]
Merge branch 'PHP-5.5'

11 years agoFix PDO::inTransaction() test for pgsql
commit | commitdiff | tree
Nikita Popov [Sun, 24 Mar 2013 16:52:16 +0000 (17:52 +0100)]
Fix PDO::inTransaction() test for pgsql

inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Johannes Schlüter [Sun, 24 Mar 2013 16:33:41 +0000 (17:33 +0100)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Johannes Schlüter [Sun, 24 Mar 2013 16:33:17 +0000 (17:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoDocument embedded server options in manpage
commit | commitdiff | tree
Johannes Schlüter [Sun, 24 Mar 2013 16:32:30 +0000 (17:32 +0100)]
Document embedded server options in manpage

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