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

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

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

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

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

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/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

root@local-hhvm:/hphp/hiphop-php# hphp/hhvm/hhvm 
HipHop Notice: Nothing to do. Either pass a .php file to run, or use -m server
*** Error in `hphp/hhvm/hhvm': free(): invalid pointer: 0x00007f21e29da500 ***
======= Backtrace: =========
/lib/x86_64-linux-gnu/libc.so.6(+0x7aa16)[0x7f21d9ed3a16]
/lib/x86_64-linux-gnu/libc.so.6(+0x7b793)[0x7f21d9ed4793]
/usr/lib/x86_64-linux-gnu/libp11-kit.so.0(+0x28b4d)[0x7f21d78c5b4d]
/lib64/ld-linux-x86-64.so.2(+0xefcf)[0x7f21e2873fcf]
/lib/x86_64-linux-gnu/libc.so.6(+0x39a91)[0x7f21d9e92a91]
/lib/x86_64-linux-gnu/libc.so.6(+0x39b15)[0x7f21d9e92b15]

simonwelsh

root@local-hhvm:/hphp/hiphop-php# gdb hphp/hhvm/hhvm 
...
(gdb) r
...
HipHop Notice: Nothing to do. Either pass a .php file to run, or use -m server
src/tcmalloc.cc:289] Attempt to free invalid pointer 0x7ffff7f45d18 

Program received signal SIGABRT, Aborted.
0x00007fffef1b51d5 in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
56	../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.

simonwelsh

TypedValue* HHVM_FUNCTION(max, ActRec *ar) {
  TypedValue* rv;
  Variant ret;
  int32_t count = ar->numArgs();

  if (LIKELY(count >= 1)) {
    Variant value(getArg<KindOfAny>(ar, 1));
    if (count == 1) {
      if (LIKELY(isContainer(value))) {
        ArrayIter iter(value);