]>
granicus.if.org Git - php/log
Johannes Schlüter [Wed, 16 Jan 2013 16:39:09 +0000 (17:39 +0100)]
Merge branch 'PHP-5.5'
Johannes Schlüter [Wed, 16 Jan 2013 16:38:55 +0000 (17:38 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 16 Jan 2013 16:38:41 +0000 (17:38 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 16 Jan 2013 16:38:17 +0000 (17:38 +0100)]
Fix NEWS after 5.3.21
Christopher Jones [Wed, 16 Jan 2013 04:38:24 +0000 (20:38 -0800)]
Fix News
Adam Harvey [Wed, 16 Jan 2013 02:21:51 +0000 (10:21 +0800)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
Adam Harvey [Wed, 16 Jan 2013 02:19:13 +0000 (10:19 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
Adam Harvey [Wed, 16 Jan 2013 02:18:00 +0000 (10:18 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Update the arguments in the prototype of fpm_socket_unix_test_connect().
Adam Harvey [Wed, 16 Jan 2013 02:06:56 +0000 (10:06 +0800)]
Update the arguments in the prototype of fpm_socket_unix_test_connect().
Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
Felipe Pena [Tue, 15 Jan 2013 21:59:30 +0000 (19:59 -0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- Fixed ZTS build
Felipe Pena [Tue, 15 Jan 2013 21:59:23 +0000 (19:59 -0200)]
- Fixed ZTS build
Felipe Pena [Tue, 15 Jan 2013 21:45:43 +0000 (19:45 -0200)]
Merge branch 'master' of git.php.net:php-src
Felipe Pena [Tue, 15 Jan 2013 21:45:09 +0000 (19:45 -0200)]
- Fixed ZTS build
Anatoliy Belsky [Tue, 15 Jan 2013 21:40:31 +0000 (22:40 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fixed build
NEWS for bug #63893
Anatoliy Belsky [Tue, 15 Jan 2013 21:39:49 +0000 (22:39 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed build
NEWS for bug #63893
Conflicts:
NEWS
Anatoliy Belsky [Tue, 15 Jan 2013 21:36:29 +0000 (22:36 +0100)]
fixed build
Lars Strojny [Tue, 15 Jan 2013 21:12:09 +0000 (22:12 +0100)]
Merge branch 'PHP-5.5'
Jille Timmermans [Tue, 15 Jan 2013 10:25:55 +0000 (11:25 +0100)]
Dereferencing process-handles no longer waits on those processes.
Implements FR #46487
Gustavo Lopes [Tue, 15 Jan 2013 20:46:57 +0000 (21:46 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed inconsequential bug in strtr()
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
Gustavo Lopes [Tue, 15 Jan 2013 20:45:22 +0000 (21:45 +0100)]
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5
* remotes/cataphract/strtr_wu94_55:
Fixed inconsequential bug in strtr()
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
Gustavo Lopes [Mon, 14 Jan 2013 16:17:58 +0000 (17:17 +0100)]
NEWS for bug #63893
Gustavo Lopes [Tue, 15 Jan 2013 20:05:21 +0000 (21:05 +0100)]
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4
* remotes/cataphract/strtr_wu94_54:
Fixed inconsequential bug in strtr()
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
Gustavo Lopes [Tue, 15 Jan 2013 16:26:24 +0000 (17:26 +0100)]
Merge branch 'strtr_wu94_54' into strtr_wu94_55
Gustavo Lopes [Tue, 15 Jan 2013 16:25:59 +0000 (17:25 +0100)]
Fixed inconsequential bug in strtr()
Andrey Hristov [Tue, 15 Jan 2013 11:21:22 +0000 (12:21 +0100)]
Merge branch 'PHP-5.5'
Andrey Hristov [Tue, 15 Jan 2013 11:20:58 +0000 (12:20 +0100)]
revert change. now it doesn't compile again...someone should fix ext/date...
Andrey Hristov [Tue, 15 Jan 2013 11:20:24 +0000 (12:20 +0100)]
Merge branch 'PHP-5.5'
Andrey Hristov [Tue, 15 Jan 2013 11:19:52 +0000 (12:19 +0100)]
Use two dtors thus allow allocation based on the alloc model of the
connection.
Andrey Hristov [Tue, 15 Jan 2013 10:33:07 +0000 (11:33 +0100)]
Merge branch 'PHP-5.5'
Andrey Hristov [Tue, 15 Jan 2013 10:32:44 +0000 (11:32 +0100)]
plug a leak - forgot ot use the dtor already written
Andrey Hristov [Tue, 15 Jan 2013 10:07:58 +0000 (11:07 +0100)]
Merge branch 'master' of ssh://git.php.net/php-src
Andrey Hristov [Tue, 15 Jan 2013 10:07:32 +0000 (11:07 +0100)]
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
Andrey Hristov [Tue, 15 Jan 2013 10:07:08 +0000 (11:07 +0100)]
Merge branch 'PHP-5.5'
Andrey Hristov [Tue, 15 Jan 2013 10:06:59 +0000 (11:06 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Adam Harvey [Tue, 15 Jan 2013 09:37:21 +0000 (17:37 +0800)]
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
This reverts commit
0510701474e8d99b5b30139b5599e44f9b555a5a .
Adam Harvey [Tue, 15 Jan 2013 09:33:54 +0000 (17:33 +0800)]
Revert "Update fputcsv() to escape all characters equally."
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.
This reverts commit
9b5cb0e8059b1e8bec096067491ed8d75f878938 .
Adam Harvey [Tue, 15 Jan 2013 09:37:21 +0000 (17:37 +0800)]
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
This reverts commit
0510701474e8d99b5b30139b5599e44f9b555a5a .
Adam Harvey [Tue, 15 Jan 2013 09:33:54 +0000 (17:33 +0800)]
Revert "Update fputcsv() to escape all characters equally."
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.
This reverts commit
9b5cb0e8059b1e8bec096067491ed8d75f878938 .
Andrey Hristov [Tue, 15 Jan 2013 09:40:15 +0000 (10:40 +0100)]
Merge branch 'master' of ssh://git.php.net/php-src
Conflicts:
NEWS
Adam Harvey [Tue, 15 Jan 2013 09:37:21 +0000 (17:37 +0800)]
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
This reverts commit
0510701474e8d99b5b30139b5599e44f9b555a5a .
Adam Harvey [Tue, 15 Jan 2013 09:35:34 +0000 (17:35 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Revert "Update fputcsv() to escape all characters equally."
Adam Harvey [Tue, 15 Jan 2013 09:33:54 +0000 (17:33 +0800)]
Revert "Update fputcsv() to escape all characters equally."
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.
This reverts commit
9b5cb0e8059b1e8bec096067491ed8d75f878938 .
Andrey Hristov [Tue, 15 Jan 2013 09:12:54 +0000 (10:12 +0100)]
Merge branch 'PHP-5.5'
Conflicts:
NEWS
Andrey Hristov [Tue, 15 Jan 2013 09:05:54 +0000 (10:05 +0100)]
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
Andrey Hristov [Tue, 15 Jan 2013 09:04:59 +0000 (10:04 +0100)]
Add support for connect attributes, as of MySQL 5.6
Lars Strojny [Tue, 15 Jan 2013 08:35:47 +0000 (09:35 +0100)]
Merge branch 'PHP-5.5'
Lars Strojny [Tue, 15 Jan 2013 08:30:44 +0000 (09:30 +0100)]
Bug #62489: dba_insert not working as expected
Stanislav Malyshev [Tue, 15 Jan 2013 08:08:44 +0000 (00:08 -0800)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix NEWS
Stanislav Malyshev [Tue, 15 Jan 2013 08:08:29 +0000 (00:08 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS
Stanislav Malyshev [Tue, 15 Jan 2013 08:06:35 +0000 (00:06 -0800)]
fix NEWS
Stanislav Malyshev [Tue, 15 Jan 2013 08:07:22 +0000 (00:07 -0800)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix NEWS
Stanislav Malyshev [Tue, 15 Jan 2013 08:07:07 +0000 (00:07 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS
Stanislav Malyshev [Tue, 15 Jan 2013 08:06:35 +0000 (00:06 -0800)]
fix NEWS
Adam Harvey [Tue, 15 Jan 2013 07:52:12 +0000 (15:52 +0800)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
Adam Harvey [Tue, 15 Jan 2013 07:50:57 +0000 (15:50 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
Adam Harvey [Tue, 15 Jan 2013 07:49:13 +0000 (15:49 +0800)]
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
Xinchen Hui [Tue, 15 Jan 2013 07:34:10 +0000 (15:34 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Tue, 15 Jan 2013 07:33:26 +0000 (15:33 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Tue, 15 Jan 2013 07:32:42 +0000 (15:32 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Tue, 15 Jan 2013 07:31:49 +0000 (15:31 +0800)]
Fixed bug #57702 (Multi-row BLOB fetches)
Adam Harvey [Tue, 15 Jan 2013 07:26:50 +0000 (15:26 +0800)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Update fputcsv() to escape all characters equally.
Adam Harvey [Tue, 15 Jan 2013 07:26:25 +0000 (15:26 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update fputcsv() to escape all characters equally.
Adam Harvey [Tue, 15 Jan 2013 07:24:21 +0000 (15:24 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Update fputcsv() to escape all characters equally.
Adam Harvey [Tue, 15 Jan 2013 07:17:45 +0000 (15:17 +0800)]
Update fputcsv() to escape all characters equally.
At present, backslashes have special case handling within fputcsv(): when one
is encountered within a field that's being escaped, escaping stops until the
next instance of the enclosure character is hit. This can result in malformed
CSV.
Fixes bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ").
Xinchen Hui [Tue, 15 Jan 2013 02:41:07 +0000 (10:41 +0800)]
Merge branch 'PHP-5.5'
Adam Harvey [Tue, 15 Jan 2013 02:08:26 +0000 (10:08 +0800)]
Fix compile failure introduced by the fix for bug #46408.
Lars Strojny [Mon, 14 Jan 2013 20:43:07 +0000 (21:43 +0100)]
Merge branch 'PHP-5.5'
Lars Strojny [Mon, 14 Jan 2013 20:41:24 +0000 (21:41 +0100)]
Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
Derick Rethans [Mon, 14 Jan 2013 20:39:06 +0000 (20:39 +0000)]
Merge branch 'PHP-5.5'
Derick Rethans [Mon, 14 Jan 2013 20:36:48 +0000 (20:36 +0000)]
Added NEWS item for DateTimeImmutable
Lars Strojny [Mon, 14 Jan 2013 20:36:28 +0000 (21:36 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Lars Strojny [Mon, 14 Jan 2013 20:35:48 +0000 (21:35 +0100)]
Bug #52958: Segfault in PDO_OCI on cleanup after running a long testsuite.
Derick Rethans [Mon, 14 Jan 2013 20:35:13 +0000 (20:35 +0000)]
Merge branch 'PHP-5.5'
Derick Rethans [Thu, 20 Dec 2012 13:22:18 +0000 (13:22 +0000)]
Make DatePeriod support DateTimeImmutable as well.
If the start element is a DateTimeImmutable object, then all returned objects
are also DateTimeImmutable objects. If the start element is a DateTime object,
then all returned objects are DateTime objects.
Derick Rethans [Wed, 19 Dec 2012 17:40:14 +0000 (17:40 +0000)]
Fixed crash bug when the non-OO interface was used.
Derick Rethans [Wed, 19 Dec 2012 16:24:38 +0000 (16:24 +0000)]
Rename DateTimePoint to DateTimeImmutable.
Derick Rethans [Mon, 17 Dec 2012 16:49:25 +0000 (16:49 +0000)]
Added another test to test the unmodified inherited methods.
Derick Rethans [Mon, 17 Dec 2012 16:49:00 +0000 (16:49 +0000)]
Added a few missing TSRMLS_DC/TSRMLS_CC.
Derick Rethans [Mon, 17 Dec 2012 16:35:52 +0000 (16:35 +0000)]
Added a test case for DateTimePoint.
Derick Rethans [Mon, 17 Dec 2012 15:31:23 +0000 (15:31 +0000)]
Implemented immutable DateTime objects as the DateTimePoint class.
Lars Strojny [Mon, 14 Jan 2013 20:25:01 +0000 (21:25 +0100)]
Merge branch 'PHP-5.5'
Lars Strojny [Mon, 14 Jan 2013 20:23:52 +0000 (21:23 +0100)]
Bug #46408: Fix double formatting for PostgreSQL bound parameters
Lars Strojny [Mon, 14 Jan 2013 19:43:55 +0000 (20:43 +0100)]
Merge branch 'PHP-5.5'
Lars Strojny [Mon, 14 Jan 2013 19:43:14 +0000 (20:43 +0100)]
PR #260: Update css for 404 pages to feel more up to date and have a consistent layout across browsers
Lars Strojny [Mon, 14 Jan 2013 17:54:08 +0000 (18:54 +0100)]
Merge branch 'PHP-5.5'
Lars Strojny [Mon, 14 Jan 2013 17:53:40 +0000 (18:53 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Lars Strojny [Mon, 14 Jan 2013 17:52:38 +0000 (18:52 +0100)]
Support BITMAPV5HEADER in getimagesize(): https://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29
Lars Strojny [Mon, 14 Jan 2013 17:16:48 +0000 (18:16 +0100)]
Merge branch 'PHP-5.5'
Lars Strojny [Mon, 14 Jan 2013 17:00:00 +0000 (18:00 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Lars Strojny [Mon, 14 Jan 2013 16:59:11 +0000 (17:59 +0100)]
Fix bug #63916: PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite
Lars Strojny [Mon, 14 Jan 2013 16:44:03 +0000 (17:44 +0100)]
Merge branch 'PHP-5.5'
Lars Strojny [Mon, 14 Jan 2013 16:36:07 +0000 (17:36 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Lars Strojny [Mon, 14 Jan 2013 16:35:07 +0000 (17:35 +0100)]
Fixed bug #63921: sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
Gustavo Lopes [Mon, 14 Jan 2013 16:27:20 +0000 (17:27 +0100)]
UPGRADING.INTERNALS: document zend_qsort_r
Gustavo Lopes [Mon, 14 Jan 2013 16:24:16 +0000 (17:24 +0100)]
Add zend_qsort_r & use it in strtr
Gustavo Lopes [Mon, 14 Jan 2013 16:19:23 +0000 (17:19 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Gustavo Lopes [Mon, 14 Jan 2013 16:17:58 +0000 (17:17 +0100)]
NEWS for bug #63893
Gustavo Lopes [Thu, 10 Jan 2013 12:09:14 +0000 (13:09 +0100)]
Remove _GNU_SOURCE, add local heap sort
Gustavo Lopes [Wed, 9 Jan 2013 22:20:32 +0000 (23:20 +0100)]
The compiler can figure this out
Gustavo Lopes [Wed, 9 Jan 2013 22:20:11 +0000 (23:20 +0100)]
Remove unused block