]> 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
Stanislav Malyshev [Thu, 13 Jun 2013 17:31:31 +0000 (10:31 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix test for bug #60322

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Thu, 13 Jun 2013 17:30:18 +0000 (10:30 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test for bug #60322

11 years agofix test for bug #60322
commit | commitdiff | tree
Stanislav Malyshev [Thu, 13 Jun 2013 17:23:23 +0000 (10:23 -0700)]
fix test for bug #60322

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Wed, 12 Jun 2013 11:15:32 +0000 (13:15 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  ensure the error_reporting level to get expected notice

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Wed, 12 Jun 2013 11:15:18 +0000 (13:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  ensure the error_reporting level to get expected notice

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Wed, 12 Jun 2013 11:14:53 +0000 (13:14 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  ensure the error_reporting level to get expected notice

11 years agoensure the error_reporting level to get expected notice
commit | commitdiff | tree
Anatol Belski [Wed, 12 Jun 2013 11:13:48 +0000 (13:13 +0200)]
ensure the error_reporting level to get expected notice

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 10:40:30 +0000 (12:40 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixed tests

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 10:39:50 +0000 (12:39 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed tests

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 10:39:28 +0000 (12:39 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fixed tests

11 years agofixed tests
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 10:38:49 +0000 (12:38 +0200)]
fixed tests

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 09:24:33 +0000 (11:24 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  missing tests for bug #53437

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 09:24:16 +0000 (11:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  missing tests for bug #53437

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 09:22:55 +0000 (11:22 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  missing tests for bug #53437

11 years agomissing tests for bug #53437
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 09:19:57 +0000 (11:19 +0200)]
missing tests for bug #53437

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 06:33:19 +0000 (08:33 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixed EOL

11 years agofixed EOL
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 06:32:54 +0000 (08:32 +0200)]
fixed EOL

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 06:26:07 +0000 (08:26 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  added closing ?>

11 years agoadded closing ?>
commit | commitdiff | tree
Anatol Belski [Tue, 11 Jun 2013 06:25:38 +0000 (08:25 +0200)]
added closing ?>

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Tue, 11 Jun 2013 01:16:23 +0000 (18:16 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix double entry
  Merge branch 'pull-request/341'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 11 Jun 2013 01:16:09 +0000 (18:16 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix double entry
  Merge branch 'pull-request/341'

11 years agofix double entry
commit | commitdiff | tree
Stanislav Malyshev [Tue, 11 Jun 2013 01:15:03 +0000 (18:15 -0700)]
fix double entry

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 21:31:57 +0000 (14:31 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'

11 years agoMerge branch 'pull-request/341'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 21:02:42 +0000 (14:02 -0700)]
Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes

11 years agoMerge branch 'pull-request/341'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 21:20:18 +0000 (14:20 -0700)]
Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes

11 years agoMerge branch 'pull-request/341'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 21:20:18 +0000 (14:20 -0700)]
Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
  typofixes

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 20:49:56 +0000 (22:49 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  split the test for 32 and 64 bit

11 years agosplit the test for 32 and 64 bit
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 20:49:30 +0000 (22:49 +0200)]
split the test for 32 and 64 bit

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 20:37:56 +0000 (13:37 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  typo fixes (argument)
  typo fixes (accommodate, parameter)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 20:36:41 +0000 (13:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)

11 years agotypo fixes (argument)
commit | commitdiff | tree
Veres Lajos [Mon, 22 Apr 2013 13:05:24 +0000 (14:05 +0100)]
typo fixes (argument)

11 years agotypo fixes (accommodate, parameter)
commit | commitdiff | tree
Veres Lajos [Mon, 22 Apr 2013 12:41:27 +0000 (13:41 +0100)]
typo fixes (accommodate, parameter)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 17:55:51 +0000 (19:55 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  missing colon

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 17:55:30 +0000 (19:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  missing colon

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 17:55:06 +0000 (19:55 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  missing colon

11 years agomissing colon
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 17:54:29 +0000 (19:54 +0200)]
missing colon

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 17:53:27 +0000 (19:53 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Backported the fix for bug #53437
  Backported the fix for bug #53437

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 17:53:03 +0000 (19:53 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Backported the fix for bug #53437
  Backported the fix for bug #53437

11 years agoBackported the fix for bug #53437
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 17:52:29 +0000 (19:52 +0200)]
Backported the fix for bug #53437

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 17:49:31 +0000 (19:49 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Backported the fix for bug #53437

11 years agoBackported the fix for bug #53437
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 17:48:18 +0000 (19:48 +0200)]
Backported the fix for bug #53437

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 16:31:40 +0000 (18:31 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixed the test

11 years agofixed the test
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 16:31:18 +0000 (18:31 +0200)]
fixed the test

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 15:50:13 +0000 (17:50 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix a BC breach related to bug #53437

11 years agoFix a BC breach related to bug #53437
commit | commitdiff | tree
Anatol Belski [Mon, 10 Jun 2013 15:48:13 +0000 (17:48 +0200)]
Fix a BC breach related to bug #53437

days and special_amount properties are exported as int again

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Mon, 10 Jun 2013 13:33:47 +0000 (21:33 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Mon, 10 Jun 2013 13:31:25 +0000 (21:31 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_compile.c

11 years agoFixed bug #64988 (Class loading order affects E_STRICT warning)
commit | commitdiff | tree
Xinchen Hui [Mon, 10 Jun 2013 13:26:11 +0000 (21:26 +0800)]
Fixed bug #64988 (Class loading order affects E_STRICT warning)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 09:24:10 +0000 (02:24 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix image method signatures

11 years agoFix image method signatures
commit | commitdiff | tree
Jakub Vrana [Wed, 15 May 2013 19:59:43 +0000 (12:59 -0700)]
Fix image method signatures

11 years agoFix image method signatures
commit | commitdiff | tree
Jakub Vrana [Wed, 15 May 2013 19:59:43 +0000 (12:59 -0700)]
Fix image method signatures

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:59:28 +0000 (12:59 +0400)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:59:09 +0000 (12:59 +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:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.
  Fix spelling and correct typo.

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:57:36 +0000 (12:57 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.
  Fix spelling and correct typo.

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:56:33 +0000 (12:56 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed test script

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:55:51 +0000 (12:55 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed test script

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:54:54 +0000 (12:54 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed test script

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 08:53:36 +0000 (01:53 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 08:53:29 +0000 (01:53 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded

11 years agoFixed test script
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:53:19 +0000 (12:53 +0400)]
Fixed test script

11 years agoPHPTests for the DOMDocument::loadHTMLfile method.
commit | commitdiff | tree
Antonio Diaz Ruiz [Mon, 6 May 2013 21:01:18 +0000 (23:01 +0200)]
PHPTests for the DOMDocument::loadHTMLfile method.
They cover
- The basic behaviour
- When the method receives as argument a file which doesn't exist
- When the argument is an empty string
- When an empty file is loaded
- When a not-well formed html file is loaded

It also includes 2 auxilary files
- An empty html file
- A not well formed html file

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 08:42:41 +0000 (01:42 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix spelling and correct typo.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 08:42:32 +0000 (01:42 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix spelling and correct typo.

11 years agoFix spelling and correct typo.
commit | commitdiff | tree
Carson McDonald [Thu, 6 Jun 2013 11:33:33 +0000 (07:33 -0400)]
Fix spelling and correct typo.

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 08:41:26 +0000 (01:41 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix spelling and correct typo.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 10 Jun 2013 08:41:16 +0000 (01:41 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix spelling and correct typo.

11 years agoFix spelling and correct typo.
commit | commitdiff | tree
Carson McDonald [Thu, 6 Jun 2013 11:33:33 +0000 (07:33 -0400)]
Fix spelling and correct typo.

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:34:34 +0000 (12:34 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Callback has to be restored in MSHUTDOWN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:34:08 +0000 (12:34 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Callback has to be restored in MSHUTDOWN

11 years agoCallback has to be restored in MSHUTDOWN
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:32:53 +0000 (12:32 +0400)]
Callback has to be restored in MSHUTDOWN

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:06:14 +0000 (12:06 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed comments

11 years agoFixed comments
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 08:05:20 +0000 (12:05 +0400)]
Fixed comments

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 07:44:54 +0000 (11:44 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Avoid multiple allocations of the same key in different processes

11 years agoAvoid multiple allocations of the same key in different processes
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 07:43:03 +0000 (11:43 +0400)]
Avoid multiple allocations of the same key in different processes

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

* PHP-5.5:
  Compact HashTables before storing them in shared memory

Conflicts:
ext/opcache/ZendAccelerator.c

11 years agoCompact HashTables before storing them in shared memory
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 07:22:19 +0000 (11:22 +0400)]
Compact HashTables before storing them in shared memory

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

* PHP-5.5:
  Use size_t instead of int

11 years agoUse size_t instead of int
commit | commitdiff | tree
Dmitry Stogov [Mon, 10 Jun 2013 06:36:35 +0000 (10:36 +0400)]
Use size_t instead of int

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 14:26:18 +0000 (22:26 +0800)]
Merge branch 'PHP-5.5'

11 years agoUpdate NEWS
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 14:26:07 +0000 (22:26 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 14:25:49 +0000 (22:25 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoUpdate NEWs
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 14:25:28 +0000 (22:25 +0800)]
Update NEWs

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 14:25:07 +0000 (22:25 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoFixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 14:24:48 +0000 (22:24 +0800)]
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 06:26:16 +0000 (14:26 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 06:25:53 +0000 (14:25 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_def.h

11 years agoFixed merge wrongly
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 06:24:05 +0000 (14:24 +0800)]
Fixed merge wrongly

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 05:50:06 +0000 (13:50 +0800)]
Merge branch 'PHP-5.5'

11 years agoUpdate NEWS
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 05:49:43 +0000 (13:49 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 05:49:26 +0000 (13:49 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_def.h

11 years agoUpdate NEWS
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 05:39:40 +0000 (13:39 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 05:35:45 +0000 (13:35 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoFixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
commit | commitdiff | tree
Xinchen Hui [Sun, 9 Jun 2013 05:20:40 +0000 (13:20 +0800)]
Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)

11 years agoFixed signedness warning
commit | commitdiff | tree
Matteo Beccati [Fri, 7 Jun 2013 07:38:58 +0000 (09:38 +0200)]
Fixed signedness warning

11 years agoNEWS
commit | commitdiff | tree
Matteo Beccati [Fri, 7 Jun 2013 07:36:41 +0000 (09:36 +0200)]
NEWS

11 years agoFixed bug #63657 (pgsqlCopyFrom/To methods use Postgres < 7.3 syntax)
commit | commitdiff | tree
Matteo Beccati [Fri, 7 Jun 2013 07:23:00 +0000 (09:23 +0200)]
Fixed bug #63657 (pgsqlCopyFrom/To methods use Postgres < 7.3 syntax)

Although still supported (for now), I've replaced with pre-9.0 syntax.
Still not cutting edge, but it works with any version PDO_pgsql is
compatible with (7.4+) and will possibly keep working for longer than
what we already had.

11 years agoNEWS
commit | commitdiff | tree
Matteo Beccati [Fri, 7 Jun 2013 07:27:42 +0000 (09:27 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Thu, 6 Jun 2013 20:27:39 +0000 (13:27 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix 5.4.16 date

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Thu, 6 Jun 2013 20:27:25 +0000 (13:27 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix 5.4.16 date

11 years agofix 5.4.16 date
commit | commitdiff | tree
Stanislav Malyshev [Thu, 6 Jun 2013 20:27:04 +0000 (13:27 -0700)]
fix 5.4.16 date

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