From 71b236d7a0eeacd25d57cc51b5e31bb225707786 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Thu, 29 Jan 2009 01:43:26 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 116 +++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog |  11 +++++
 2 files changed, 127 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 746b53f334..c9213e6725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,119 @@
+2009-01-28  Scott MacVicar  <scott@macvicar.net>
+
+    * (PHP_5_3)
+      ext/sqlite3/sqlite3.c:
+      Fix build on Windows
+
+2009-01-28  Nuno Lopes  <nunoplopes@sapo.pt>
+
+    * ZendEngine2/zend_stream.c:
+      MFB: turn the offset parameter of mmap() back to 0
+
+    * (PHP_5_3)
+      ZendEngine2/zend_stream.c:
+      the offset parameter of mmap() must be aligned to a page boundary (although
+      linux doesnt strictly require it).
+      use 0 as offset as it will be small and increment the ptrs afterwards
+
+2009-01-28  Scott MacVicar  <scott@macvicar.net>
+
+    * (PHP_5_3)
+      ext/standard/tests/file/filetype_variation3.phpt:
+      Broken test, skipif sections had a parse error
+
+2009-01-28  Nuno Lopes  <nunoplopes@sapo.pt>
+
+    * (PHP_5_3)
+      NEWS:
+      BFN
+
+2009-01-28  Felipe Pena  <felipensp@gmail.com>
+
+    * (php_5_3_0beta1)
+      ext/enchant/enchant.c:
+      
+      - Fix build
+
+2009-01-28  Nuno Lopes  <nunoplopes@sapo.pt>
+
+    * ext/pcre/php_pcre.c
+      ext/pcre/tests/bug47229.phpt
+      ext/pcre/tests/preg_quote_basic.phpt:
+      MFB: fix bug #47229: preg_quote should escape '-'
+
+    * ext/pcre/tests/bug47229.phpt
+      ext/pcre/tests/bug47229.phpt
+      ext/pcre/tests/preg_quote_basic.phpt:
+      
+      file bug47229.phpt was initially added on branch PHP_5_3.
+
+    * (PHP_5_3)
+      ext/pcre/php_pcre.c:
+      fix bug #47229: preg_quote should escape '-'
+
+2009-01-28  Johannes Schlüter  <johannes@schlueters.de>
+
+    * (PHP_5_2)
+      ext/standard/tests/mail/.cvsignore
+      ext/standard/tests/mail/.cvsignore:
+      - Add .cvsignore
+
+    * ext/standard/tests/mail/.cvsignore
+      ext/standard/tests/mail/.cvsignore
+      ext/standard/tests/mail/.cvsignore:
+        1.1.4;
+      - Add .cvsignore
+
+    * (PHP_5_3)
+      NEWS
+      configure.in
+      main/php_version.h:
+      Back to -dev
+
+    * (PHP_5_3)
+      NEWS
+      configure.in
+      main/php_version.h:
+      PHP 5.3.0beta1
+
+    * (PHP_5_3)
+      ext/phar/config.m4:
+      Properly disable phar for the moment
+
+2009-01-28  Pierre-Alain Joye  <pierre.dev@gmail.com>
+
+    * (PHP_5_3)
+      NEWS:
+      - enchant entry and fix news
+
+2009-01-28  Steph Fox  <steph.fox@virgin.net>
+
+    * (PHP_5_3)
+      UPGRADING:
+      - Skeleton version taken directly from the scratchpad and tidied.
+
+2009-01-28  Scott MacVicar  <scott@macvicar.net>
+
+    * (PHP_5_3)
+      NEWS
+      ext/phar/config.m4:
+      Disable Phar on big endian systems for beta 1.
+
+2009-01-28  Antony Dovgal  <tony@daylessday.org>
+
+    * ext/date/tests/date_sunrise_and_sunset_basic.phpt
+      ext/date/tests/date_sunrise_and_sunset_basic.phpt
+      ext/date/tests/date_sunrise_and_sunset_basic.phpt:
+      fix test
+
+2009-01-28  Pierre-Alain Joye  <pierre.dev@gmail.com>
+
+    * ext/spl/php_spl.h:
+      - MFB: fix build
+
+    * win32/php_stdint.h:
+      - MFB: sync 5.3
+
 2009-01-27  Ilia Alshanetsky  <ilia@prohost.org>
 
     * sapi/apache_hooks/php_apache.c:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 4884997fb3..1330a33181 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-28  Nuno Lopes  <nunoplopes@sapo.pt>
+
+    * zend_stream.c:
+      MFB: turn the offset parameter of mmap() back to 0
+
+    * (PHP_5_3)
+      zend_stream.c:
+      the offset parameter of mmap() must be aligned to a page boundary (although
+      linux doesnt strictly require it).
+      use 0 as offset as it will be small and increment the ptrs afterwards
+
 2009-01-26  Christian Seiler  <chris_se@gmx.net>
 
     * (PHP_5_3)
-- 
2.50.1