[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] com pecl/networking/ssh2: Merge remote-tracking branch 'origin/pr/20': =?UTF-8?Q?php=5Fss
From:       Casper Langemeijer <langemeijer () php ! net>
Date:       2016-09-27 3:26:35
Message-ID: php-mail-08b9ab3d9d900002e80b331caef50ccb2072165713 () git ! php ! net
[Download RAW message or body]

Commit:    0485f23341d8e2482247d323289b5a59b2c20b35
Author:    Casper Langemeijer <casper.langemeijer@procurios.nl>         Tue, 27 Sep \
                2016 05:26:35 +0200
Parents:   f6d69a57b137dfa079422aaaec610756551a9f60 \
                8d81d6bbc16fb61cd4f7d092a74513f33f9fddf7
Branches:  master

Link:       http://git.php.net/?p=pecl/networking/ssh2.git;a=commitdiff;h=0485f23341d8e2482247d323289b5a59b2c20b35


Log:
Merge remote-tracking branch 'origin/pr/20'

Changed paths:
  MM  php_ssh2.h
  MM  ssh2.c
  MM  ssh2_fopen_wrappers.c
  MM  ssh2_sftp.c


Diff:
diff --cc php_ssh2.h
index 839bf55,24b664d..71971e9
--- a/php_ssh2.h
+++ b/php_ssh2.h
@@@ -94,19 -94,19 +94,19 @@@ typedef struct _php_ssh2_pkey_subsys_da
  
  #define SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession) \
  if ((session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zsession), \
                PHP_SSH2_SESSION_RES_NAME, le_ssh2_session)) == NULL) { \
 -    RETURN_FALSE; \
 +	RETURN_FALSE; \
  } \
  if (libssh2_userauth_authenticated(session)) { \
- 	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection already authenticated"); \
+ 	php_error_docref(NULL, E_WARNING, "Connection already authenticated"); \
  	RETURN_FALSE; \
  }
  
  #define SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession) \
  if ((session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zsession), \
                PHP_SSH2_SESSION_RES_NAME, le_ssh2_session)) == NULL) { \
 -    RETURN_FALSE; \
 +	RETURN_FALSE; \
  } \
  if (!libssh2_userauth_authenticated(session)) { \
- 	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not authenticated"); \
+ 	php_error_docref(NULL, E_WARNING, "Connection not authenticated"); \
  	RETURN_FALSE; \
  }
  
diff --cc ssh2_fopen_wrappers.c
index b525081,2716c69..6fcdc20
--- a/ssh2_fopen_wrappers.c
+++ b/ssh2_fopen_wrappers.c
@@@ -1137,11 -1130,9 +1136,17 @@@ PHP_FUNCTION(ssh2_scp_send
  
  	remote_file = libssh2_scp_send_ex(session, remote_filename, create_mode, \
ssb.sb.st_size, ssb.sb.st_atime, ssb.sb.st_mtime);  if (!remote_file) {
 +		int last_error = 0;
  		char *error_msg = NULL;
  
++<<<<<<< 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
  		php_stream_close(local_file);
  		RETURN_FALSE;
  	}


--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]