granicus.if.org Git

]> granicus.if.org Git - php/log

Anatoliy Belsky [Wed, 4 Apr 2012 17:14:06 +0000 (19:14 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
updated the NEWS with the latest fileinfo changes

commit | commitdiff | tree

Anatoliy Belsky [Wed, 4 Apr 2012 16:54:03 +0000 (18:54 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
updated the NEWS with the latest fileinfo changes

Conflicts:
NEWS

commit | commitdiff | tree

Matt Ficken [Wed, 4 Apr 2012 16:39:24 +0000 (18:39 +0200)]

Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt

commit | commitdiff | tree

Anatoliy Belsky [Wed, 4 Apr 2012 10:36:34 +0000 (12:36 +0200)]

updated the NEWS with the latest fileinfo changes

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 09:43:12 +0000 (17:43 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
fix typo

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 09:41:25 +0000 (17:41 +0800)]

fix typo

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 09:40:01 +0000 (17:40 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Update NEWS for #61617

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 09:38:43 +0000 (17:38 +0800)]

Update NEWS for #61617

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 09:38:15 +0000 (17:38 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
Cherry-pick 4cc74767

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 09:36:18 +0000 (17:36 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
Cherry-pick 4cc74767

Conflicts:
NEWS

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 09:22:37 +0000 (17:22 +0800)]

Fixed bug #61617 (Libxml tests failed(ht is already destroyed))

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Wed, 4 Apr 2012 08:59:51 +0000 (09:59 +0100)]

Cherry-pick 4cc74767

Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227.

Conflicts:

ext/standard/tests/general_functions/bug60227.phpt
ext/standard/tests/general_functions/bug60227_1.phpt
ext/standard/tests/general_functions/bug60227_2.phpt
main/SAPI.c

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 08:38:43 +0000 (16:38 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix warning "suggest parentheses around assignment"

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 08:37:29 +0000 (16:37 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix warning "suggest parentheses around assignment"

Conflicts:
main/SAPI.c

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 08:35:32 +0000 (16:35 +0800)]

Fix warning "suggest parentheses around assignment"

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 08:16:54 +0000 (16:16 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed bug #61605 (header_remove() does not remove all headers)

Conflicts:
NEWS

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 08:14:28 +0000 (16:14 +0800)]

Fixed bug Fixed bug #61605 (header_remove() does not remove all headers)

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 08:13:02 +0000 (16:13 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 08:01:43 +0000 (16:01 +0800)]

Fixed bug #61605 (header_remove() does not remove all headers)

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 07:24:41 +0000 (15:24 +0800)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Xinchen Hui [Wed, 4 Apr 2012 07:24:08 +0000 (15:24 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Sat, 24 Mar 2012 04:15:04 +0000 (12:15 +0800)]

Fix test

cherry-pick from php-5.4

commit | commitdiff | tree

Ilia Alshanetsky [Tue, 3 Apr 2012 12:49:45 +0000 (08:49 -0400)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed bug #61423 (gzip compression fails).

commit | commitdiff | tree

Ilia Alshanetsky [Tue, 3 Apr 2012 12:47:00 +0000 (08:47 -0400)]

Fixed bug #61423 (gzip compression fails).

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 12:27:43 +0000 (14:27 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61460 popen_close_error-win32 expected output is wrong
  Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
  Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
  Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 12:22:59 +0000 (14:22 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61460 popen_close_error-win32 expected output is wrong

Conflicts:
ext/standard/tests/file/popen_pclose_error-win32.phpt

commit | commitdiff | tree

Matt Ficken [Tue, 3 Apr 2012 12:19:43 +0000 (14:19 +0200)]

Fix bug #61460 popen_close_error-win32 expected output is wrong

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 11:23:06 +0000 (13:23 +0200)]

Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 11:07:51 +0000 (13:07 +0200)]

Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 09:04:52 +0000 (11:04 +0200)]

Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 11:24:31 +0000 (13:24 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 11:23:06 +0000 (13:23 +0200)]

Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 11:09:17 +0000 (13:09 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 11:07:51 +0000 (13:07 +0200)]

Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 09:08:02 +0000 (11:08 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt

commit | commitdiff | tree

Anatoliy Belsky [Tue, 3 Apr 2012 09:04:52 +0000 (11:04 +0200)]

Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt

commit | commitdiff | tree

Xinchen Hui [Tue, 3 Apr 2012 04:19:05 +0000 (12:19 +0800)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Xinchen Hui [Tue, 3 Apr 2012 04:18:42 +0000 (12:18 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Tue, 3 Apr 2012 04:13:59 +0000 (12:13 +0800)]

Update NEWS for #61541

commit | commitdiff | tree

Klaus Silveira [Tue, 3 Apr 2012 01:54:57 +0000 (22:54 -0300)]

Small performance improvement. The current code is correct, but if it is used inside a long loop or long strings, it's inefficient.

commit | commitdiff | tree

Moriyoshi Koizumi [Mon, 2 Apr 2012 17:00:34 +0000 (02:00 +0900)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Moriyoshi Koizumi [Mon, 2 Apr 2012 17:00:23 +0000 (02:00 +0900)]

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
NEWS

commit | commitdiff | tree

Moriyoshi Koizumi [Mon, 2 Apr 2012 16:32:42 +0000 (01:32 +0900)]

Reset LIBS temporarily to make sure PHP_CHECK_FUNC will look into libc.

See Gentoo bug #364139. https://bugs.gentoo.org/show_bug.cgi?id=364139
Reported by Naohiro Aota.

commit | commitdiff | tree

Anatoliy Belsky [Mon, 2 Apr 2012 15:43:23 +0000 (17:43 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
  updated the libmagic.patch
  Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
  Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
  - update to openssl 0.9.8u
  - update to openssl 0.9.8u

commit | commitdiff | tree

Anatoliy Belsky [Mon, 2 Apr 2012 15:36:50 +0000 (17:36 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated the libmagic.patch
  Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
  Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
  - update to openssl 0.9.8u

Conflicts:
ext/fileinfo/tests/finfo_open_001.phpt
ext/fileinfo/tests/finfo_open_error.phpt
win32/build/libs_version.txt

commit | commitdiff | tree

Anatoliy Belsky [Mon, 2 Apr 2012 15:27:23 +0000 (17:27 +0200)]

updated the libmagic.patch

commit | commitdiff | tree

Anatoliy Belsky [Mon, 2 Apr 2012 15:22:46 +0000 (17:22 +0200)]

Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails

This patch fixes the failure caused by the
posix lseek and read versions under windows in cdf_read() .
Additionally all the occurences of lseek and read
was replaced by _lseek and _reed for windows.

commit | commitdiff | tree

Anatoliy Belsky [Mon, 2 Apr 2012 15:19:09 +0000 (17:19 +0200)]

Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails

commit | commitdiff | tree

Pierre Joye [Mon, 2 Apr 2012 10:59:03 +0000 (12:59 +0200)]

- update to openssl 0.9.8u

commit | commitdiff | tree

Pierre Joye [Mon, 2 Apr 2012 10:59:03 +0000 (12:59 +0200)]

- update to openssl 0.9.8u

commit | commitdiff | tree

Pierre Joye [Mon, 2 Apr 2012 10:59:03 +0000 (12:59 +0200)]

- update to openssl 0.9.8u

commit | commitdiff | tree

Derick Rethans [Mon, 2 Apr 2012 09:40:03 +0000 (10:40 +0100)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Derick Rethans [Mon, 2 Apr 2012 09:40:02 +0000 (10:40 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Derick Rethans [Mon, 2 Apr 2012 09:40:01 +0000 (10:40 +0100)]

- Updated to version 2012.3 (2012c)

commit | commitdiff | tree

Popa Adrian Marius [Mon, 2 Apr 2012 07:03:25 +0000 (10:03 +0300)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:

commit | commitdiff | tree

Popa Adrian Marius [Mon, 2 Apr 2012 07:03:18 +0000 (10:03 +0300)]

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

commit | commitdiff | tree

Popa Adrian Marius [Mon, 2 Apr 2012 07:02:45 +0000 (10:02 +0300)]

Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

commit | commitdiff | tree

Popa Adrian Marius [Mon, 2 Apr 2012 06:57:48 +0000 (09:57 +0300)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 22:36:59 +0000 (23:36 +0100)]

Merge branch 'intl_calendar'

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 22:35:29 +0000 (23:35 +0100)]

Update UPGRADING with changes.

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 21:46:55 +0000 (22:46 +0100)]

Fixed tests that required a "default" timezone.

Added date.timezone=Atlantic/Azores to all tests that were failing because
of ext/date warning about a timezone not having been set.

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 19:28:54 +0000 (21:28 +0200)]

Compatibility with old versions of ICU (4.0+).

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 14:16:56 +0000 (16:16 +0200)]

Added support for new method TimeZone::getUnknown() added in ICU 49.

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 13:37:07 +0000 (15:37 +0200)]

Supported Calendar methods new to ICU 49.

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 10:04:48 +0000 (12:04 +0200)]

Fix TimeZone tests failing due to new data in ICU 49.

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 09:11:40 +0000 (11:11 +0200)]

Initial checkin of calendar/timezone code.

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 22:26:06 +0000 (23:26 +0100)]

Put new function in correct section.

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sun, 1 Apr 2012 08:59:11 +0000 (10:59 +0200)]

Convert EOL style to Unix.

commit | commitdiff | tree

Ferenc Kovacs [Sat, 31 Mar 2012 09:23:26 +0000 (11:23 +0200)]

Revert "making the test fail for testing jenkins report mail. I will revert this soon."

This reverts commit b8fe28f4550f560b010f98675608c7188a2c1fa4.

commit | commitdiff | tree

Ferenc Kovacs [Sat, 31 Mar 2012 09:22:16 +0000 (11:22 +0200)]

making the test fail for testing jenkins report mail. I will revert this soon.

commit | commitdiff | tree

David Soria Parra [Sat, 31 Mar 2012 07:34:43 +0000 (09:34 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Cleanup Safe Mode related comment in SG(request_info)

commit | commitdiff | tree

David Soria Parra [Sat, 31 Mar 2012 07:34:25 +0000 (09:34 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Cleanup Safe Mode related comment in SG(request_info)

commit | commitdiff | tree

reeze [Fri, 30 Mar 2012 17:04:38 +0000 (01:04 +0800)]

Cleanup Safe Mode related comment in SG(request_info)

commit | commitdiff | tree

Christopher Jones [Fri, 30 Mar 2012 23:18:15 +0000 (16:18 -0700)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Add php.ini parameter checks for OCI8

commit | commitdiff | tree

Christopher Jones [Fri, 30 Mar 2012 23:17:37 +0000 (16:17 -0700)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Add php.ini parameter checks for OCI8

commit | commitdiff | tree

Christopher Jones [Fri, 30 Mar 2012 23:16:32 +0000 (16:16 -0700)]

Merge branch 'add-oci8-ini-tests' into PHP-5.3

* add-oci8-ini-tests:
Add php.ini parameter checks for OCI8

commit | commitdiff | tree

Christopher Jones [Fri, 30 Mar 2012 23:12:25 +0000 (16:12 -0700)]

Add php.ini parameter checks for OCI8

Add tests for OCI8 php.ini parameters particularly to check
which parameters can be changes with ini_set().

commit | commitdiff | tree

Christopher Jones [Fri, 30 Mar 2012 17:48:49 +0000 (10:48 -0700)]

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags

commit | commitdiff | tree

Christopher Jones [Fri, 30 Mar 2012 17:48:45 +0000 (10:48 -0700)]

Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags

commit | commitdiff | tree

Xinchen Hui [Fri, 30 Mar 2012 12:57:25 +0000 (20:57 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags

commit | commitdiff | tree

Xinchen Hui [Fri, 30 Mar 2012 12:50:45 +0000 (20:50 +0800)]

trivial change try to ci a "fake" merge

seems now a empty merge will not be accepted by pre-receive-hook
"remote: We cannot figure out what you comitted!"

commit | commitdiff | tree

Xinchen Hui [Fri, 30 Mar 2012 12:45:09 +0000 (20:45 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix test, parameter signatures was introduced only into 5.4

commit | commitdiff | tree

Xinchen Hui [Fri, 30 Mar 2012 12:37:48 +0000 (20:37 +0800)]

Fix test, parameter signatures was introduced only into 5.4

commit | commitdiff | tree

Stanislav Malyshev [Fri, 30 Mar 2012 07:01:29 +0000 (00:01 -0700)]

fix makedist for new tags

commit | commitdiff | tree

Christopher Jones [Fri, 30 Mar 2012 00:42:43 +0000 (17:42 -0700)]

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  This will be PHP 5.3.12
  ext/pcntl/pcntl.c: Fix typo in comment
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  Revert "Merge branch 'pull-request/24'" (apply correct workflow)
  ext/pcntl/pcntl.c: Fix typo in comment
  ext/pcntl/pcntl.c: Fix typo in comment
  - fix bug #61541, Segfault when using ob_* in output_callback
  - fix bug #61541, Segfault when using ob_* in output_callback
  ext/pcntl/pcntl.c: Fix typo in comment
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history

commit | commitdiff | tree

Christopher Jones [Fri, 30 Mar 2012 00:42:40 +0000 (17:42 -0700)]

Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  This will be PHP 5.3.12
  ext/pcntl/pcntl.c: Fix typo in comment
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  ext/pcntl/pcntl.c: Fix typo in comment
  ext/pcntl/pcntl.c: Fix typo in comment
  - fix bug #61541, Segfault when using ob_* in output_callback
  - fix bug #61541, Segfault when using ob_* in output_callback
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history

commit | commitdiff | tree

Popa Adrian Marius [Thu, 29 Mar 2012 15:28:38 +0000 (18:28 +0300)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix firebird bug #60947 , tested and now it prints the header page information from database

commit | commitdiff | tree

Popa Adrian Marius [Thu, 29 Mar 2012 15:28:22 +0000 (18:28 +0300)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix firebird bug #60947 , tested and now it prints the header page information from database

commit | commitdiff | tree

Popa Adrian Marius [Thu, 29 Mar 2012 15:28:01 +0000 (18:28 +0300)]

Fix firebird bug #60947 , tested and now it prints the header page information from database

commit | commitdiff | tree

Shein Alexey [Thu, 29 Mar 2012 12:25:49 +0000 (17:25 +0500)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed bug61115-1.phpt for debug build version.
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)

commit | commitdiff | tree

Shein Alexey [Thu, 29 Mar 2012 12:03:43 +0000 (17:03 +0500)]

Resolved conflict.

commit | commitdiff | tree

Shein Alexey [Thu, 29 Mar 2012 12:01:40 +0000 (17:01 +0500)]

Merge branch 'fix-debug-build-bug61115-1.phpt' into PHP-5.3

* fix-debug-build-bug61115-1.phpt:
Fixed bug61115-1.phpt for debug build version.

commit | commitdiff | tree

Shein Alexey [Thu, 29 Mar 2012 11:51:45 +0000 (16:51 +0500)]

Fixed bug61115-1.phpt for debug build version.

commit | commitdiff | tree

Yasuo Ohgaki [Thu, 29 Mar 2012 11:06:00 +0000 (20:06 +0900)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)