simonwelsh

diff --git a/core/ClassInfo.php b/core/ClassInfo.php
index 5a25a4a..c341b5f 100644
--- a/core/ClassInfo.php
+++ b/core/ClassInfo.php
@@ -153,16 +153,17 @@ class ClassInfo {
        public static function ancestry($class, $tablesOnly = false) {
                if (!is_string($class)) $class = get_class($class);
 
                $cacheKey = $class . '_' . (string)$tablesOnly;
                $parent = $class;

simonwelsh

hphp/test/slow/password/invalid_salt.php
--- hphp/test/slow/password/invalid_salt.php.expectf	2013-12-14 18:03:57.771416817 +1300
+++ hphp/test/slow/password/invalid_salt.php.out	2014-02-11 18:33:58.799016439 +1300
@@ -1 +1 @@
-HipHop Warning: password_hash(): Non-string salt parameter supplied
\ No newline at end of file
+HipHop Warning: password_hash(): Non-string salt parameter supplied in /hphp/hiphop-php/hphp/test/slow/password/invalid_salt.php on line 2
\ No newline at end of file

simonwelsh

diff --git a/hphp/runtime/ext/curl/ext_curl.cpp b/hphp/runtime/ext/curl/ext_curl.cpp
index 5de9a03..bbcac07 100644
--- a/hphp/runtime/ext/curl/ext_curl.cpp
+++ b/hphp/runtime/ext/curl/ext_curl.cpp
@@ -1296,10 +1296,12 @@ static void hphp_curl_multi_select(CURLM *mh, int timeout_ms, int *ret) {
 
 #ifndef HAVE_CURL_MULTI_SELECT
 # ifdef HAVE_CURL_MULTI_WAIT
-#  define curl_multi_select(mh, tm, ret) curl_multi_wait((mh), nullptr, 0, (tm), (ret))
+#  define curl_multi_select_func(mh, tm, ret) curl_multi_wait((mh), nullptr, 0, (tm), (ret))

simonwelsh

Array
(
    [0] => "apache"
    [1] => "apc"
    [2] => "bcmath"
    [3] => "bz2"
    [4] => "code_model"
    [5] => "ctype"
    [6] => "curl"
    [7] => "date"

simonwelsh

From e14402b5ef7e906721647450640d2d5e96bc016a Mon Sep 17 00:00:00 2001
From: Simon Welsh <[email protected]>
Date: Tue, 11 Mar 2014 09:23:21 +1300
Subject: [PATCH] Update C*Ref argument types to const versions

---
 hphp/tools/check_native_signatures.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hphp/tools/check_native_signatures.php b/hphp/tools/check_native_signatures.php

simonwelsh

static TypedValue* HHVM_FUNCTION(mysql_connect_with_db, ActRec *ar) {
  ar->m_r = *php_mysql_do_connect(
    getArg<KindOfString>(ar, 0, null_string.get()), // server
    getArg<KindOfString>(ar, 1, null_string.get()), // username
    getArg<KindOfString>(ar, 2, null_string.get()), // password
    getArg<KindOfString>(ar, 3, null_string.get()), // database
    getArg<KindOfInt64>(ar, 5, 0), // client_flags
    false, false,
    getArg<KindOfInt64>(ar, 6, -1), // connect_timeout_ms
    getArg<KindOfInt64>(ar, 7, -1) // query_timeout_ms

simonwelsh

diff --git a/hphp/runtime/ext/gd/libgd/gdft.cpp b/hphp/runtime/ext/gd/libgd/gdft.cpp
index e2a511b..29158ab 100644
--- a/hphp/runtime/ext/gd/libgd/gdft.cpp
+++ b/hphp/runtime/ext/gd/libgd/gdft.cpp
@@ -61,7 +61,8 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
 #else
 
 #include "gdcache.h"
-#include <freetype/config/ftheader.h>
+#include <ft2build.h>

simonwelsh

Log {
        RuntimeErrorReportingLevel = 32767
        Level = Info
        File = /var/log/hhvm.log

        AccessLogDefaultFormat = %h %l %u %t \"%r\" %>s %b
        Access {
                * {
                        File = /var/log/hhvm-access.log
                }

simonwelsh

/* main/php_config.h.  Generated from php_config.h.in by configure.  */
/* main/php_config.h.in.  Generated from configure.in by autoheader.  */


#if defined(__GNUC__) && __GNUC__ >= 4
# define ZEND_API __attribute__ ((visibility("default")))
# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
#else
# define ZEND_API
# define ZEND_DLEXPORT

simonwelsh

class MemcachedData {
 public:
  class Impl {
   public:
    Impl() :
      compression(true),
      serializer(q_Memcached$$SERIALIZER_PHP),
      rescode(q_Memcached$$RES_SUCCESS) {
      memcached_create(&memcached);
    };