yohgaki

<?php
// Example code how to eliminate getter and setter methods
// with traits introduced from PHP 5.4

trait Accessors {
  public function __get($name) {
    if ($this->r_property[$name])
      return $this->$name;
    else
      trigger_error("Access to read protected property");

yohgaki

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 621c4e1..a21e0ca 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -61,40 +61,9 @@ typedef struct {
 } ps_files;
 
 ps_module ps_mod_files = {
-	PS_MOD(files)
+	PS_MOD_SID(files)

yohgaki

Index: ext/pgsql/tests/08escape.phpt
===================================================================
--- ext/pgsql/tests/08escape.phpt	(リビジョン 319557)
+++ ext/pgsql/tests/08escape.phpt	(作業コピー)
@@ -11,8 +11,9 @@
 // pg_escape_string() test
 $before = "ABC\\ABC\'";
 $expect  = "ABC\\\\ABC\\'";
+$expect2  = "ABC\\\\ABC\\\\''"; //the way escape string differs from PostgreSQL 9.0
 $after = pg_escape_string($before);

yohgaki

<?php
$db = pg_connect('host=127.0.0.1 dbname=test');

// Create test table with reserved word "user"
$sql = 'drop table test2; create table test2 ('.pg_escape_identifier('user').' text);';
var_dump($sql);
pg_query($sql);

// Example use of pg_escape_literal(). 
// Note that no quotes around string. Quotes are added by the function.

yohgaki

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 621c4e1..a21e0ca 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -61,40 +61,9 @@ typedef struct {
 } ps_files;
 
 ps_module ps_mod_files = {
-	PS_MOD(files)
+	PS_MOD_SID(files)

yohgaki

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index ec25bea..2046934 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -61,40 +61,9 @@ typedef struct {
 } ps_files;
 
 ps_module ps_mod_files = {
-	PS_MOD(files)
+	PS_MOD_SID(files)

yohgaki

[yohgaki@dev php-src]$ git diff HEAD^
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index e54b824..ad66779 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -947,6 +947,11 @@ PHP_MINIT_FUNCTION(pgsql)
        le_result = zend_register_list_destructors_ex(_free_result, NULL, "pgsql result", module_number);
        le_lofp = zend_register_list_destructors_ex(_free_ptr, NULL, "pgsql large object", module_number);
        le_string = zend_register_list_destructors_ex(_free_ptr, NULL, "pgsql string", module_number);
+#if HAVE_PG_CONFIG_H

yohgaki

Index: is-subclass-of.xml
===================================================================
--- is-subclass-of.xml	(リビジョン 324628)
+++ is-subclass-of.xml	(作業コピー)
@@ -42,7 +42,8 @@
      <term><parameter>allow_string</parameter></term>
      <listitem>
       <para>
-       Whether to call autoloader if the class doesn't exist.
+       If this parameter set to false, string class name as <parameter>object</parameter>

yohgaki

Index: array.xml
===================================================================
--- array.xml	(リビジョン 324628)
+++ array.xml	(作業コピー)
@@ -118,6 +118,61 @@
      </listitem>
     </itemizedlist>
    </para>
+
+   <para>

yohgaki

diff -ur httpd-1.3.42.orig//src/support/htdigest.c httpd-1.3.42/src/support/htdigest.c
--- httpd-1.3.42.orig//src/support/htdigest.c	2006-07-12 17:16:05.000000000 +0900
+++ httpd-1.3.42/src/support/htdigest.c	2012-04-01 11:48:49.705771078 +0900
@@ -71,7 +71,7 @@
     while ((line[y++] = line[x++]));
 }
 
-static int getline(char *s, int n, FILE *f)
+static int my_getline(char *s, int n, FILE *f)
 {