php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login
Bug #73198 Unclosed if statements and version control conflict markers in source code
Submitted: 2016-09-28 16:11 UTC Modified: 2016-09-28 17:44 UTC
From: bdoherty at caxy dot com Assigned: langemeijer (profile)
Status: Closed Package: ssh2 (PECL)
PHP Version: 7.0.11 OS: Mac OS X
Private report: No CVE-ID: None
View Add Comment Developer Edit
Welcome! If you don't have a Git account, you can't do anything here.
You can add a comment by following this link or if you reported this bug, you can edit this bug over here.
Block user comment
Status: Assign to:
Package:
Bug Type:
Summary:
From: bdoherty at caxy dot com
New email:
PHP Version: OS:

 

 [2016-09-28 16:11 UTC] bdoherty at caxy dot com
Description:
------------
I am trying to build the ssh2 extension but currently the master branch of this project is broken.

1. The commit https://github.com/php/pecl-networking-ssh2/commit/9124448b6f8a91d4a19cad5743c1c279f97bf9c4#diff-b640953b8106b6c045b59c3d62ff3e7f removed a needed #endif directive. Without the #endif at the end of this file, the build fails:

./php_ssh2.h:21:2: error: unterminated conditional directive
#ifndef PHP_SSH2_H


2. The file ssh2_fopen_wrappers.c contains unresolved merge conflicts. Starting on line 1142:

<<<<<<< HEAD
		last_error = libssh2_session_last_error(session, &error_msg, NULL, 0);
		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failure creating remote file: %s", error_msg);
||||||| merged common ancestors
		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failure creating remote file: %s", error_msg);
=======
		php_error_docref(NULL, E_WARNING, "Failure creating remote file: %s", error_msg);
>>>>>>> origin/pr/20




Patches

Add a Patch

Pull Requests

Add a Pull Request

History

AllCommentsChangesGit/SVN commitsRelated reports
 [2016-09-28 16:31 UTC] cmb@php.net
-Status: Open +Status: Verified -Assigned To: +Assigned To: langemeijer
 [2016-09-28 17:01 UTC] langemeijer@php.net
My apologies, I will fix this in the next few hours
 [2016-09-28 17:44 UTC] langemeijer@php.net
-Status: Verified +Status: Closed
 
PHP Copyright © 2001-2020 The PHP Group
All rights reserved.
Last updated: Sat Nov 28 16:01:24 2020 UTC