Commits

rickysu committed ad484d9 Merge

Merge remote-tracking branch 'upstream/master'

  • Participants
  • Parent commits 1d3f062, 24bb187

Comments (0)

Files changed (4)

File classes/buffer_event.c

 				sizeof(PHP_EVENT_SUN_PREFIX) - 1) == 0) {
 		/* UNIX domain socket path */
 
-		struct sockaddr_un *sun;
+		struct sockaddr_un *s_un;
 
-		sun             = (struct sockaddr_un *) &ss;
-		sun->sun_family = AF_UNIX;
+		s_un             = (struct sockaddr_un *) &ss;
+		s_un->sun_family = AF_UNIX;
 		ss_len          = sizeof(struct sockaddr_un);
 
-		strcpy(sun->sun_path, addr + sizeof(PHP_EVENT_SUN_PREFIX) - 1);
+		strcpy(s_un->sun_path, addr + sizeof(PHP_EVENT_SUN_PREFIX) - 1);
 
 	} else
 #endif

File classes/listener.c

 #ifdef AF_UNIX
 		if (strncasecmp(Z_STRVAL_PP(ppztarget), PHP_EVENT_SUN_PREFIX,
 					sizeof(PHP_EVENT_SUN_PREFIX) - 1) == 0) {
-			struct sockaddr_un *sun;
+			struct sockaddr_un *s_un;
 
-			sun             = (struct sockaddr_un *) &ss;
-			sun->sun_family = AF_UNIX;
+			s_un             = (struct sockaddr_un *) &ss;
+			s_un->sun_family = AF_UNIX;
 
-			strcpy(sun->sun_path, Z_STRVAL_PP(ppztarget) + sizeof(PHP_EVENT_SUN_PREFIX) - 1);
+			strcpy(s_un->sun_path, Z_STRVAL_PP(ppztarget) + sizeof(PHP_EVENT_SUN_PREFIX) - 1);
 			ss_len = sizeof(struct sockaddr_un);
 		} else
 #endif
 [  --enable-event-sockets Enable sockets support in Event], yes, no)
 
 if test "$PHP_EVENT_CORE" != "no"; then
+
+  OLD_LDFLAGS=$LDFLAGS
+  OLD_LIBS=$LIBS
+
   dnl {{{ Check for PHP version
 
   dnl The following fails sometimes. See bug #65319
   PHP_ADD_INCLUDE($ext_builddir/classes)
   PHP_ADD_INCLUDE($ext_builddir)
   PHP_SUBST(EVENT_SHARED_LIBADD)
-  PHP_SUBST(CFLAGS)
-  PHP_SUBST(LDLAGS)
-  PHP_SUBST(LIBS)
+
+  LDFLAGS=$OLD_LDFLAGS
+  LIBS=$OLD_LIBS
 
   dnl This works with static building only
   dnl test -z $PHP_SOCKETS && PHP_SOCKETS="no"
     AC_DEFINE(HAVE_SOCKETS, 1, [Whether sockets extension is enabled])
   fi
 
+
   PHP_ADD_MAKEFILE_FRAGMENT
 fi
 
     <email>osmanov@php.net</email>
     <active>yes</active>
   </lead>
-  <date>2013-09-14</date>
+  <date>2013-09-15</date>
   <!--{{{ Current version -->
   <version>
     <release>1.7.8</release>
   </stability>
   <license uri="http://www.php.net/license">PHP</license>
   <notes><![CDATA[
-  Fix: build error on Solaris(when sockaddr_un was not available)
+  Fix: build error on Solaris
+  Introduced negative dependencies: libevent extension, windows OS
   ]]></notes>
   <!--}}}-->
   <!--{{{ Contents -->
       <pearinstaller>
         <min>1.4.0a1</min>
       </pearinstaller>
+      <package>
+        <name>libevent</name>
+        <channel>pecl.php.net</channel>
+        <min>0.0.2</min>
+        <conflicts/>
+        <providesextension>libevent</providesextension>
+      </package>
+      <extension>
+        <name>libevent</name>
+        <conflicts/>
+      </extension>
+      <os>
+        <name>windows</name>
+        <conflicts/>
+      </os>
     </required>
   </dependencies>
   <providesextension>event</providesextension>
       </stability>
       <license uri="http://www.php.net/license">PHP</license>
       <notes><![CDATA[
-  Fix: build error on Solaris(when sockaddr_un was not available)
+  Fix: build error on Solaris
+  Introduced negative dependencies: libevent extension, windows OS
   ]]></notes>
     </release>
     <!--}}}-->