granicus.if.org Git

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

projects / php / log

commit | commitdiff | tree

Felipe Pena [Sun, 29 Apr 2012 22:14:20 +0000 (19:14 -0300)]

Merge branch 'PHP-5.4'

* PHP-5.4:
- Added missing bound check in iptcparse() (path by chris at chiappa.net)

commit | commitdiff | tree

Felipe Pena [Sun, 29 Apr 2012 22:14:03 +0000 (19:14 -0300)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
- Added missing bound check in iptcparse() (path by chris at chiappa.net)

commit | commitdiff | tree

Felipe Pena [Sun, 29 Apr 2012 22:12:12 +0000 (19:12 -0300)]

- Added missing bound check in iptcparse() (path by chris at chiappa.net)

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Sat, 28 Apr 2012 15:32:44 +0000 (16:32 +0100)]

Fix build on MS Windows

commit | commitdiff | tree

Anatoliy Belsky [Sat, 28 Apr 2012 09:45:24 +0000 (11:45 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()

commit | commitdiff | tree

Anatoliy Belsky [Sat, 28 Apr 2012 09:44:54 +0000 (11:44 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()

commit | commitdiff | tree

Matt Ficken [Sat, 28 Apr 2012 09:42:42 +0000 (11:42 +0200)]

Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()

commit | commitdiff | tree

Anatoliy Belsky [Thu, 26 Apr 2012 13:41:06 +0000 (15:41 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug 61786 Failing tests in ext\session\tests\*

commit | commitdiff | tree

Anatoliy Belsky [Thu, 26 Apr 2012 13:39:45 +0000 (15:39 +0200)]

Fix bug 61786 Failing tests in ext\session\tests\*

commit | commitdiff | tree

Anatoliy Belsky [Thu, 26 Apr 2012 13:18:17 +0000 (15:18 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 26 Apr 2012 13:17:46 +0000 (15:17 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
ext/sqlite3/tests/sqlite3_15_open_error.phpt

commit | commitdiff | tree

Anatoliy Belsky [Thu, 26 Apr 2012 13:14:26 +0000 (15:14 +0200)]

Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 26 Apr 2012 11:30:25 +0000 (13:30 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 26 Apr 2012 11:28:49 +0000 (13:28 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 26 Apr 2012 11:27:01 +0000 (13:27 +0200)]

Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Wed, 25 Apr 2012 16:53:56 +0000 (18:53 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Partial fix for bug 61743 to get correct icacls path
sync version

Conflicts:
configure.in

commit | commitdiff | tree

Anatoliy Belsky [Wed, 25 Apr 2012 16:46:22 +0000 (18:46 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Partial fix for bug 61743 to get correct icacls path

commit | commitdiff | tree

Anatoliy Belsky [Wed, 25 Apr 2012 16:38:27 +0000 (18:38 +0200)]

Partial fix for bug 61743 to get correct icacls path

commit | commitdiff | tree

Stanislav Malyshev [Tue, 24 Apr 2012 23:30:37 +0000 (16:30 -0700)]

sync version

commit | commitdiff | tree

Michael Wallner [Tue, 24 Apr 2012 19:22:39 +0000 (21:22 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
fix NEWS order

commit | commitdiff | tree

Michael Wallner [Tue, 24 Apr 2012 19:22:19 +0000 (21:22 +0200)]

fix NEWS order

commit | commitdiff | tree

Michael Wallner [Tue, 24 Apr 2012 18:43:59 +0000 (20:43 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
BFN

commit | commitdiff | tree

Michael Wallner [Tue, 24 Apr 2012 18:40:19 +0000 (20:40 +0200)]

BFN

commit | commitdiff | tree

Michael Wallner [Tue, 24 Apr 2012 18:37:29 +0000 (20:37 +0200)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Michael Wallner [Tue, 24 Apr 2012 18:35:49 +0000 (20:35 +0200)]

fix bug #61443

Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly

the check for PHP_OUTPUT_WRITTEN was over-zealous

commit | commitdiff | tree

Michael Wallner [Tue, 24 Apr 2012 17:52:45 +0000 (19:52 +0200)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Michael Wallner [Tue, 24 Apr 2012 17:50:00 +0000 (19:50 +0200)]

fixed bug #61820

using ob_gzhandler will complain about headers already sent
when no compression

the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event

commit | commitdiff | tree

Anatoliy Belsky [Tue, 24 Apr 2012 12:09:07 +0000 (14:09 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only

commit | commitdiff | tree

Anatoliy Belsky [Tue, 24 Apr 2012 12:08:26 +0000 (14:08 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only

commit | commitdiff | tree

Anatoliy Belsky [Tue, 24 Apr 2012 12:05:35 +0000 (14:05 +0200)]

Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only

commit | commitdiff | tree

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

Merge branch 'PHP-5.4'

* PHP-5.4:
Bug 61610 adopted expected warnings for 5.4

commit | commitdiff | tree

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

Bug 61610 adopted expected warnings for 5.4

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Mon, 23 Apr 2012 21:10:50 +0000 (22:10 +0100)]

Merge branch '5.4'

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Mon, 23 Apr 2012 21:10:23 +0000 (22:10 +0100)]

Merge branch '5.3' into 5.4

commit | commitdiff | tree

Gustavo André dos Santos Lopes [Mon, 23 Apr 2012 21:09:38 +0000 (22:09 +0100)]

Fixed bug #61764: 'I' unpacks n as signed if n > 2^31-1 on LP64

Also fixed possible invalid read on big endian LP64.

commit | commitdiff | tree

Felipe Pena [Mon, 23 Apr 2012 18:19:35 +0000 (15:19 -0300)]

Merge branch 'PHP-5.4'

* PHP-5.4:
- Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)

commit | commitdiff | tree

Felipe Pena [Mon, 23 Apr 2012 18:19:23 +0000 (15:19 -0300)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
- Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)

commit | commitdiff | tree

Felipe Pena [Mon, 23 Apr 2012 18:18:12 +0000 (15:18 -0300)]

- Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)

commit | commitdiff | tree

Anatoliy Belsky [Sun, 22 Apr 2012 17:30:26 +0000 (19:30 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61811 three of finfo tests failed, see also #61812.

commit | commitdiff | tree

Anatoliy Belsky [Sun, 22 Apr 2012 17:29:52 +0000 (19:29 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61811 three of finfo tests failed, see also #61812.

commit | commitdiff | tree

Anatoliy Belsky [Sun, 22 Apr 2012 17:26:54 +0000 (19:26 +0200)]

Fix bug #61811 three of finfo tests failed, see also #61812.

The remaining two was assidentially merged back from 5.4

commit | commitdiff | tree

Xinchen Hui [Sun, 22 Apr 2012 12:00:07 +0000 (20:00 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed warning implicit declaration of function 'file_printedlen'

commit | commitdiff | tree

Xinchen Hui [Sun, 22 Apr 2012 11:59:46 +0000 (19:59 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed warning implicit declaration of function 'file_printedlen'

commit | commitdiff | tree

Xinchen Hui [Sun, 22 Apr 2012 11:52:07 +0000 (19:52 +0800)]

Fixed warning implicit declaration of function 'file_printedlen'

commit | commitdiff | tree

Xinchen Hui [Sun, 22 Apr 2012 11:40:22 +0000 (19:40 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Update NEWS
Fixed bug #61812 (Uninitialised value used in libmagic)

commit | commitdiff | tree

Xinchen Hui [Sun, 22 Apr 2012 11:39:50 +0000 (19:39 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Sun, 22 Apr 2012 11:39:02 +0000 (19:39 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #61812 (Uninitialised value used in libmagic)

commit | commitdiff | tree

Xinchen Hui [Sun, 22 Apr 2012 11:38:14 +0000 (19:38 +0800)]

Fixed bug #61812 (Uninitialised value used in libmagic)

commit | commitdiff | tree

Johannes Schlüter [Sun, 22 Apr 2012 00:26:07 +0000 (02:26 +0200)]

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

* 'PHP-5.4' of git.php.net:/php-src:
  Fix test
  typo in test
  Make css string constant
  Fixed typo
  Improved performance while sending error page
  - BFN
  - BFN
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
  - Fixed expected test result (patch by ab@php.net in #61769)
  - Fix test title
  add pg_escape_identifier/pg_escape_literal
  fix RCs
  Update to 5.4.2-dev
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

commit | commitdiff | tree

Johannes Schlüter [Sun, 22 Apr 2012 00:25:36 +0000 (02:25 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix folding

commit | commitdiff | tree

Johannes Schlüter [Sun, 22 Apr 2012 00:25:02 +0000 (02:25 +0200)]

Fix folding

commit | commitdiff | tree

Xinchen Hui [Sat, 21 Apr 2012 08:03:53 +0000 (16:03 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix test
- BFN

commit | commitdiff | tree

Xinchen Hui [Sat, 21 Apr 2012 08:03:18 +0000 (16:03 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix test
- BFN

commit | commitdiff | tree

Xinchen Hui [Sat, 21 Apr 2012 08:02:25 +0000 (16:02 +0800)]

Fix test

Reported by cjones

commit | commitdiff | tree

Xinchen Hui [Sat, 21 Apr 2012 02:16:08 +0000 (10:16 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
typo in test

commit | commitdiff | tree

Xinchen Hui [Sat, 21 Apr 2012 02:15:35 +0000 (10:15 +0800)]

typo in test

commit | commitdiff | tree

Xinchen Hui [Sat, 21 Apr 2012 01:31:45 +0000 (09:31 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Make css string constant

commit | commitdiff | tree

Xinchen Hui [Sat, 21 Apr 2012 01:31:00 +0000 (09:31 +0800)]

Make css string constant

commit | commitdiff | tree

Xinchen Hui [Fri, 20 Apr 2012 16:12:10 +0000 (00:12 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed typo

commit | commitdiff | tree

Xinchen Hui [Fri, 20 Apr 2012 16:11:06 +0000 (00:11 +0800)]

Fixed typo

report by reeze.xia@gmail.com

commit | commitdiff | tree

Xinchen Hui [Fri, 20 Apr 2012 16:02:12 +0000 (00:02 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Improved performance while sending error page
- BFN

commit | commitdiff | tree

Xinchen Hui [Fri, 20 Apr 2012 16:01:10 +0000 (00:01 +0800)]

Improved performance while sending error page

this also fixed bug #61785 (Memory leak when access a non-exists file without router)

commit | commitdiff | tree

Felipe Pena [Fri, 20 Apr 2012 02:23:59 +0000 (23:23 -0300)]

- BFN

commit | commitdiff | tree

Felipe Pena [Fri, 20 Apr 2012 02:23:46 +0000 (23:23 -0300)]

- BFN

commit | commitdiff | tree

Felipe Pena [Fri, 20 Apr 2012 02:14:00 +0000 (23:14 -0300)]

Merge branch 'PHP-5.4'

* PHP-5.4:
- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net

commit | commitdiff | tree

Felipe Pena [Fri, 20 Apr 2012 02:13:37 +0000 (23:13 -0300)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net

commit | commitdiff | tree

Felipe Pena [Fri, 20 Apr 2012 02:12:47 +0000 (23:12 -0300)]

- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net

commit | commitdiff | tree

Felipe Pena [Thu, 19 Apr 2012 23:15:26 +0000 (20:15 -0300)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Felipe Pena [Thu, 19 Apr 2012 23:15:11 +0000 (20:15 -0300)]

- Fixed expected test result (patch by ab@php.net in #61769)

commit | commitdiff | tree

Felipe Pena [Thu, 19 Apr 2012 23:07:37 +0000 (20:07 -0300)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Felipe Pena [Thu, 19 Apr 2012 23:05:30 +0000 (20:05 -0300)]

- Fix test title

commit | commitdiff | tree

Stanislav Malyshev [Thu, 19 Apr 2012 20:40:36 +0000 (13:40 -0700)]

Merge branch 'PHP-5.4'

* PHP-5.4:
add pg_escape_identifier/pg_escape_literal

commit | commitdiff | tree

Yasuo Ohgaki [Fri, 25 Nov 2011 02:21:01 +0000 (02:21 +0000)]

add pg_escape_identifier/pg_escape_literal

commit | commitdiff | tree

Stanislav Malyshev [Thu, 19 Apr 2012 18:37:55 +0000 (11:37 -0700)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

commit | commitdiff | tree

Stanislav Malyshev [Thu, 19 Apr 2012 18:37:31 +0000 (11:37 -0700)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

commit | commitdiff | tree

Stanislav Malyshev [Thu, 19 Apr 2012 18:05:17 +0000 (11:05 -0700)]

Merge branch 'pull-request/61' into PHP-5.3

* pull-request/61:
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

commit | commitdiff | tree

Stanislav Malyshev [Thu, 19 Apr 2012 18:03:12 +0000 (11:03 -0700)]

Merge branch 'PHP-5.4'

* PHP-5.4:
fix RCs
Update to 5.4.2-dev

Conflicts:
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Thu, 19 Apr 2012 07:25:44 +0000 (00:25 -0700)]

fix RCs

commit | commitdiff | tree

Christopher Jones [Mon, 16 Apr 2012 20:43:41 +0000 (13:43 -0700)]

Update to 5.4.2-dev

After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.

commit | commitdiff | tree

Johannes Schlüter [Thu, 19 Apr 2012 10:49:47 +0000 (12:49 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Commit generated file
Fix bug #61755 parsing bug can lead to access violations

commit | commitdiff | tree

Johannes Schlüter [Thu, 19 Apr 2012 10:48:18 +0000 (12:48 +0200)]

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

* 'PHP-5.4' of git.php.net:/php-src:

commit | commitdiff | tree

Johannes Schlüter [Thu, 19 Apr 2012 10:47:47 +0000 (12:47 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails

commit | commitdiff | tree

Johannes Schlüter [Thu, 19 Apr 2012 10:47:09 +0000 (12:47 +0200)]

Commit generated file

commit | commitdiff | tree

Johannes Schlüter [Thu, 19 Apr 2012 10:46:02 +0000 (12:46 +0200)]

Fix bug #61755 parsing bug can lead to access violations

commit | commitdiff | tree

Anatoliy Belsky [Thu, 19 Apr 2012 09:38:35 +0000 (11:38 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 19 Apr 2012 09:36:50 +0000 (11:36 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 19 Apr 2012 09:20:16 +0000 (11:20 +0200)]

Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails

The solution was already introduced in 5.4 by Etienne Kneuss and
Pierre but wasn't merged back into 5.3 . SplFileObject should
not be used with directories. So just putting together all the
necessary pieces from 5.4

commit | commitdiff | tree

Sherif Ramadan [Thu, 19 Apr 2012 08:44:43 +0000 (04:44 -0400)]

Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 22:30:58 +0000 (00:30 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Drop old README

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 22:30:45 +0000 (00:30 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Drop old README

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 22:29:24 +0000 (00:29 +0200)]

Drop old README

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 22:08:42 +0000 (00:08 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix slight grammar glitch (thanks Dan Brown)

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 22:08:36 +0000 (00:08 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix slight grammar glitch (thanks Dan Brown)

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 22:07:40 +0000 (00:07 +0200)]

Fix slight grammar glitch (thanks Dan Brown)

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 20:51:15 +0000 (22:51 +0200)]

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

* 'master' of git.php.net:/php-src:

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 20:51:06 +0000 (22:51 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
  update NEWS

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 20:50:21 +0000 (22:50 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Update generated file.
Ensure the SQL parser is regenerated after changes.

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 20:47:14 +0000 (22:47 +0200)]

Update generated file.

commit | commitdiff | tree

Johannes Schlüter [Wed, 18 Apr 2012 20:45:59 +0000 (22:45 +0200)]

Ensure the SQL parser is regenerated after changes.

commit | commitdiff | tree

Xinchen Hui [Wed, 18 Apr 2012 10:48:36 +0000 (18:48 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix NEWS, the previous wrong was introduced in commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
update NEWS

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

RSS Atom