Browse code
c-rest-engine: Fixing typo in code
Change-Id: I31f0542cef510c47c48d994406417f5584870d05
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4863
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Kumar Kaushik <kaushikk@vmware.com>
Kumar Kaushik authored on 2018/03/08 04:45:02Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Name: c-rest-engine |
| 2 | 2 |
Summary: minimal http(s) server library |
| 3 | 3 |
Version: 1.2 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
Group: Applications/System |
| 6 | 6 |
Vendor: VMware, Inc. |
| 7 | 7 |
License: Apache 2.0 |
| ... | ... |
@@ -13,6 +13,7 @@ BuildRequires: openssl-devel >= 1.0.1 |
| 13 | 13 |
Source0: %{name}-%{version}.tar.gz
|
| 14 | 14 |
Patch1: c-rest-engine-fix-log-file-len.patch |
| 15 | 15 |
Patch2: preprocess-timeout.patch |
| 16 |
+Patch3: typo_fixes.patch |
|
| 16 | 17 |
%define sha1 c-rest-engine=25aa9d1f2680e26114dee18365c510692552f8e4 |
| 17 | 18 |
|
| 18 | 19 |
%description |
| ... | ... |
@@ -32,6 +33,7 @@ development libs and header files for c-rest-engine |
| 32 | 32 |
%setup -q |
| 33 | 33 |
%patch1 -p1 |
| 34 | 34 |
%patch2 -p1 |
| 35 |
+%patch3 -p1 |
|
| 35 | 36 |
|
| 36 | 37 |
%build |
| 37 | 38 |
cd build |
| ... | ... |
@@ -64,6 +66,8 @@ find %{buildroot} -name '*.la' -delete
|
| 64 | 64 |
# %doc ChangeLog README COPYING |
| 65 | 65 |
|
| 66 | 66 |
%changelog |
| 67 |
+* Wed Mar 07 2018 Kumar Kaushik <kaushikk@vmware.com> 1.2-3 |
|
| 68 |
+- Appying patch for some typo in code. |
|
| 67 | 69 |
* Fri Feb 23 2018 Kumar Kaushik <kaushikk@vmware.com> 1.2-2 |
| 68 | 70 |
- Appying patch for preprocess timeout. |
| 69 | 71 |
* Wed Feb 14 2018 Kumar Kaushik <kaushikk@vmware.com> 1.2-1 |
| 70 | 72 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,43 @@ |
| 0 |
+From 4484acf47c572b5a1272fc85182f1432ce9606c2 Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: Kumar Kaushik <kaushikk@vmware.com> |
|
| 2 |
+Date: Fri, 2 Mar 2018 16:57:00 -0800 |
|
| 3 |
+Subject: [PATCH] Fixing some typo in code |
|
| 4 |
+ |
|
| 5 |
+Change-Id: Ia193afde3224f4adde5d7c25d58e08ded679f911 |
|
| 6 |
+--- |
|
| 7 |
+ transport/posix/socket.c | 5 ++--- |
|
| 8 |
+ 1 file changed, 2 insertions(+), 3 deletions(-) |
|
| 9 |
+ |
|
| 10 |
+diff --git a/transport/posix/socket.c b/transport/posix/socket.c |
|
| 11 |
+index 44cfbfd..355610f 100644 |
|
| 12 |
+--- a/transport/posix/socket.c |
|
| 13 |
+@@ -426,7 +426,7 @@ VmSockPosixAddEventToQueueInLock( |
|
| 14 |
+ ) |
|
| 15 |
+ {
|
|
| 16 |
+ DWORD dwError = REST_ENGINE_SUCCESS; |
|
| 17 |
+- BOOLEAN bLocked = TRUE; |
|
| 18 |
++ BOOLEAN bLocked = FALSE; |
|
| 19 |
+ |
|
| 20 |
+ if (!pQueue || !pSocket) |
|
| 21 |
+ {
|
|
| 22 |
+@@ -579,7 +579,6 @@ VmSockPosixWaitForEvent( |
|
| 23 |
+ {
|
|
| 24 |
+ eventType = VM_SOCK_EVENT_TYPE_CONNECTION_CLOSED; |
|
| 25 |
+ pSocket = pEventSocket; |
|
| 26 |
+- BAIL_ON_VMREST_ERROR(dwError); |
|
| 27 |
+ } |
|
| 28 |
+ else if (pEventSocket->type == VM_SOCK_TYPE_LISTENER) // New connection request |
|
| 29 |
+ {
|
|
| 30 |
+@@ -651,10 +650,10 @@ VmSockPosixWaitForEvent( |
|
| 31 |
+ else if (pEventSocket->type == VM_SOCK_TYPE_TIMER) // Time out event |
|
| 32 |
+ {
|
|
| 33 |
+ pSocket = pEventSocket; |
|
| 34 |
+- VMREST_LOG_INFO(pRESTHandle, "Timeout event happened on IO Socket fd %d, timer fd %d", pSocket->pIoSocket->fd, pSocket->fd); |
|
| 35 |
+ |
|
| 36 |
+ if (pSocket->pIoSocket) |
|
| 37 |
+ {
|
|
| 38 |
++ VMREST_LOG_INFO(pRESTHandle, "Timeout event happened on IO Socket fd %d, timer fd %d", pSocket->pIoSocket->fd, pSocket->fd); |
|
| 39 |
+ /**** Delete IO socket from queue so that we don't get any further notification ****/ |
|
| 40 |
+ dwError = VmSockPosixDeleteEventFromQueue( |
|
| 41 |
+ pRESTHandle, |