This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/cookbooks/fb_apache/README.md b/cookbooks/fb_apache/README.md | |
index 40d6f0c..daff042 100644 | |
--- a/cookbooks/fb_apache/README.md | |
+++ b/cookbooks/fb_apache/README.md | |
@@ -11,20 +11,21 @@ Attributes | |
* node['fb_apache']['sites'][$SITE][$CONFIG] | |
* node['fb_apache']['sysconfig'][$KEY] | |
* node['fb_apache']['sysconfig']['_extra_lines'] | |
* node['fb_apache']['modules'] | |
* node['fb_apache']['modules_directory'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/include/http_core.h b/include/http_core.h | |
index 15c9bac524..036d62486b 100644 | |
--- a/include/http_core.h | |
+++ b/include/http_core.h | |
@@ -1059,6 +1059,8 @@ AP_DECLARE(int) ap_state_query(int query_code); | |
#define AP_SQ_RM_CONFIG_TEST 3 | |
/** only dump some parts of the config */ | |
#define AP_SQ_RM_CONFIG_DUMP 4 | |
+ /** rewrite test */ | |
+#define AP_SQ_RM_REWRITE_TEST 5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# | |
# 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 | |
# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
// 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); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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)) | |
} |
NewerOlder