Skip to content

Instantly share code, notes, and snippets.

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 1506e6fef4..91c885f58c 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1277,6 +1277,7 @@ PHP_MINIT_FUNCTION(openssl)
OpenSSL_add_all_algorithms();
SSL_load_error_strings();
#else
+ OSSL_PROVIDER_load(NULL, "legacy");
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
diff --git a/termbox2.h b/termbox2.h
index a716dbd..0ec61e1 100644
--- a/termbox2.h
+++ b/termbox2.h
@@ -1816,7 +1816,12 @@ int tb_print_ex(int x, int y, uintattr_t fg, uintattr_t bg, size_t *out_w,
*out_w = 0;
}
while (*str) {
- str += tb_utf8_char_to_unicode(&uni, str);
+ if ((rv = tb_utf8_char_to_unicode(&uni, str)) == TB_ERR) {
diff --git a/config.m4 b/config.m4
index 521dfbb..b9dfa85 100644
--- a/config.m4
+++ b/config.m4
@@ -8,7 +8,7 @@ if test "$PHP_INJECTION" != "no"; then
LIBSYMBOL=libinjection_is_sqli
PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
[
- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $INJECTION_DIR, INJECTION_SHARED_LIBADD)
+ LDFLAGS="$LDFLAGS $INJECTION_DIR/libinjection.a"
adam@a9626:~/curl-openssl-investigation$ ./curl-test-opensslv1 30 | tee >(awk '{print $1}' | descstat ______total) >(awk '{print $2}' | descstat pretransfer) | cat
0.0516350 0.0083990
0.0557380 0.0115380
0.0637240 0.0194700
0.0637580 0.0193470
0.0595150 0.0183500
0.0598030 0.0180890
0.0597670 0.0188390
0.0597350 0.0187390
0.0634720 0.0189160
diff --git a/Zend/tests/is_in_autoload.phpt b/Zend/tests/is_in_autoload.phpt
new file mode 100644
index 0000000000..29d4ca7ccc
--- /dev/null
+++ b/Zend/tests/is_in_autoload.phpt
@@ -0,0 +1,49 @@
+--TEST--
+Test is_in_autoload() functionality
+--FILE--
+<?php
#
# Copyright:: Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
// gcc -g -O0 -Ilib -Llib test.c lib/libzstd.a -o test && ./test aaaaaaaaaaaa
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <zstd.h>
int main(int argc, char **argv) {
char *payload = argc > 1 ? argv[1] : "compress me";
size_t payload_len = strlen(payload);
diff --git a/go/cmd/zk/zkcmd.go b/go/cmd/zk/zkcmd.go
index 6b2c4a3840..8045d33b3f 100644
--- a/go/cmd/zk/zkcmd.go
+++ b/go/cmd/zk/zkcmd.go
@@ -466,41 +466,41 @@ func cmdTouch(ctx context.Context, subFlags *pflag.FlagSet, args []string) error
case createParents:
_, err = zk2topo.CreateRecursive(ctx, zconn, zkPath, data, 0, zk.WorldACL(zk.PermAll), 10)
default:
_, err = zconn.Create(ctx, zkPath, data, 0, zk.WorldACL(zk.PermAll))
}
diff --git a/go/vt/vttablet/tabletmanager/tm_init.go b/go/vt/vttablet/tabletmanager/tm_init.go
index 63e0961f86..e157842913 100644
--- a/go/vt/vttablet/tabletmanager/tm_init.go
+++ b/go/vt/vttablet/tabletmanager/tm_init.go
@@ -920,8 +920,10 @@ func (tm *TabletManager) initializeReplication(ctx context.Context, tabletType t
// If using semi-sync, we need to enable it before connecting to primary.
// We should set the correct type, since it is used in replica semi-sync
tablet.Type = tabletType
- if err := tm.fixSemiSync(tabletType, convertBoolToSemiSyncAction(reparentutil.IsReplicaSemiSync(durability, currentPrimary.Tablet, tablet))); err != nil {
- return nil, err
diff --git a/include/http_config.h b/include/http_config.h
index c93c3b2..ade284b 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -269,20 +269,22 @@ struct ap_configfile_t {
/**< an apr_file_gets()-like function */
apr_status_t (*getstr) (void *buf, apr_size_t bufsiz, void *param);
/**< a close handler function */
apr_status_t (*close) (void *param);
/**< the argument passed to getch/getstr/close */